From 413429e214156b724e18ddcbd639fb3310505011 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Thu, 9 Apr 2020 08:30:58 +0100
Subject: [PATCH 1/5] tutorials/.../DTCHull: Changed the atmospheric boundary
 condition to prghEntrainmentPressure

This has removed all the noise/checkerboarding from the vicinity of the
atmospheric boundary.
---
 tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig       | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig | 2 +-
 tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig b/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig
index 6931b64ebf..2f8186218d 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0/p_rgh.orig
@@ -37,7 +37,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghEntrainmentPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
index 6931b64ebf..2f8186218d 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/p_rgh.orig
@@ -37,7 +37,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghEntrainmentPressure;
         p0              uniform 0;
     }
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig
index 6931b64ebf..2f8186218d 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/p_rgh.orig
@@ -37,7 +37,7 @@ boundaryField
 
     atmosphere
     {
-        type            totalPressure;
+        type            prghEntrainmentPressure;
         p0              uniform 0;
     }
 

From 0207f85191ca9c59f3049535fcca08a2d674aa83 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Thu, 9 Apr 2020 13:08:37 +0100
Subject: [PATCH 2/5] fvOptions/.../semiImplicitSource: Construct functions on
 read

---
 .../pointFields/pointFieldsFwd.H              |   5 +-
 .../objectFunction1/objectFunction1.H         | 143 ++++++++++++++++++
 .../objectFunction1Templates.C                | 131 ++++++++++++++++
 .../fields/surfaceFields/surfaceFieldsFwd.H   |   5 +-
 .../fields/volFields/volFieldsFwd.H           |   5 +-
 .../semiImplicitSource/semiImplicitSource.C   |  43 +++---
 .../semiImplicitSource/semiImplicitSource.H   |   8 +-
 7 files changed, 318 insertions(+), 22 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C

diff --git a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H
index e656ee2e2d..9b3d9c4581 100644
--- a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H
+++ b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,6 +51,9 @@ class pointPatchField;
 template<class Type, template<class> class PatchField, class GeoMesh>
 class GeometricField;
 
+template<class Type>
+using PointField = GeometricField<Type, pointPatchField, pointMesh>;
+
 typedef GeometricField<scalar, pointPatchField, pointMesh> pointScalarField;
 typedef GeometricField<vector, pointPatchField, pointMesh> pointVectorField;
 typedef GeometricField<sphericalTensor, pointPatchField, pointMesh>
diff --git a/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H
new file mode 100644
index 0000000000..e3aff1c97c
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H
@@ -0,0 +1,143 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more 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::objectFunction1
+
+Description
+    Wrapper around Function1 that constructs a function of type associated with
+    an object found in the database.
+
+SourceFiles
+    objectFunction1Templates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef objectFunction1_H
+#define objectFunction1_H
+
+#include "Function1.H"
+#include "objectRegistry.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class objectFunction1 Declaration
+\*---------------------------------------------------------------------------*/
+
+class objectFunction1
+:
+    private autoPtr<Function1<scalar>>,
+    private autoPtr<Function1<vector>>,
+    private autoPtr<Function1<symmTensor>>,
+    private autoPtr<Function1<sphericalTensor>>,
+    private autoPtr<Function1<tensor>>
+{
+    // Private Classes
+
+        //- Tag structure used to deduce type in the templated constructor
+        template <class PrimitiveType>
+        struct type
+        {};
+
+
+    // Private Constructors
+
+        //- Construct from an name and a dictionary
+        template <class PrimitiveType>
+        objectFunction1
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const type<PrimitiveType>&
+        );
+
+
+public:
+
+    // Selector
+
+        template <template <class> class ObjectType>
+        static autoPtr<objectFunction1> New
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const word& objectName,
+            const objectRegistry& db
+        );
+
+
+    //- Destructor
+    ~objectFunction1();
+
+
+    // Member Functions
+
+        // Evaluation
+
+            //- Return value as a function of (scalar) independent variable
+            template <class PrimitiveType>
+            PrimitiveType value(const scalar x) const;
+
+            //- Return value as a function of (scalar) independent variable
+            template <class PrimitiveType>
+            tmp<Field<PrimitiveType>> value(const scalarField& x) const;
+
+            //- Integrate between two (scalar) values
+            template <class PrimitiveType>
+            PrimitiveType integrate(const scalar x1, const scalar x2) const;
+
+            //- Integrate between two (scalar) values
+            template <class PrimitiveType>
+            tmp<Field<PrimitiveType>> integrate
+            (
+                const scalarField& x1,
+                const scalarField& x2
+            ) const;
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const objectFunction1&) = delete;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "objectFunction1Templates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C
new file mode 100644
index 0000000000..8a183f9bf1
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more 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 "objectFunction1.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class PrimitiveType>
+Foam::objectFunction1::objectFunction1
+(
+    const word& entryName,
+    const dictionary& dict,
+    const type<PrimitiveType>&
+)
+:
+    autoPtr<Function1<PrimitiveType>>
+    (
+        Function1<PrimitiveType>::New(entryName, dict).ptr()
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+template <template <class> class ObjectType>
+Foam::autoPtr<Foam::objectFunction1> Foam::objectFunction1::New
+(
+    const word& entryName,
+    const dictionary& dict,
+    const word& objectName,
+    const objectRegistry& db
+)
+{
+    autoPtr<objectFunction1> ptr
+    (
+        db.foundObject<ObjectType<scalar>>(objectName)
+      ? new objectFunction1(entryName, dict, type<scalar>())
+      : db.foundObject<ObjectType<vector>>(objectName)
+      ? new objectFunction1(entryName, dict, type<vector>())
+      : db.foundObject<ObjectType<symmTensor>>(objectName)
+      ? new objectFunction1(entryName, dict, type<symmTensor>())
+      : db.foundObject<ObjectType<sphericalTensor>>(objectName)
+      ? new objectFunction1(entryName, dict, type<sphericalTensor>())
+      : db.foundObject<ObjectType<tensor>>(objectName)
+      ? new objectFunction1(entryName, dict, type<tensor>())
+      : nullptr
+    );
+
+    if (!ptr.valid())
+    {
+        // Spit lookup error
+        db.lookupObject<regIOobject>(objectName);
+    }
+
+    return ptr;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::objectFunction1::~objectFunction1()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template <class PrimitiveType>
+PrimitiveType Foam::objectFunction1::value
+(
+    const scalar x
+) const
+{
+    return autoPtr<Function1<PrimitiveType>>::operator*().value(x);
+}
+
+
+template <class PrimitiveType>
+Foam::tmp<Foam::Field<PrimitiveType>> Foam::objectFunction1::value
+(
+    const scalarField& x
+) const
+{
+    return autoPtr<Function1<PrimitiveType>>::operator*().value(x);
+}
+
+
+template <class PrimitiveType>
+PrimitiveType Foam::objectFunction1::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    return autoPtr<Function1<PrimitiveType>>::operator*().integrate(x1, x2);
+}
+
+
+template <class PrimitiveType>
+Foam::tmp<Foam::Field<PrimitiveType>> Foam::objectFunction1::integrate
+(
+    const scalarField& x1,
+    const scalarField& x2
+) const
+{
+    return autoPtr<Function1<PrimitiveType>>::operator*().integrate(x1, x2);
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H b/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H
index 87530f7beb..c8f7625606 100644
--- a/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H
+++ b/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,6 +51,9 @@ class fvsPatchField;
 template<class Type, template<class> class PatchField, class GeoMesh>
 class GeometricField;
 
+template<class Type>
+using SurfaceField = GeometricField<Type, fvsPatchField, surfaceMesh>;
+
 typedef GeometricField<scalar, fvsPatchField, surfaceMesh> surfaceScalarField;
 typedef GeometricField<vector, fvsPatchField, surfaceMesh> surfaceVectorField;
 typedef GeometricField<sphericalTensor, fvsPatchField, surfaceMesh>
diff --git a/src/finiteVolume/fields/volFields/volFieldsFwd.H b/src/finiteVolume/fields/volFields/volFieldsFwd.H
index 461c6b42ea..823d0d784d 100644
--- a/src/finiteVolume/fields/volFields/volFieldsFwd.H
+++ b/src/finiteVolume/fields/volFields/volFieldsFwd.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,6 +51,9 @@ class fvPatchField;
 template<class Type, template<class> class PatchField, class GeoMesh>
 class GeometricField;
 
+template<class Type>
+using VolField = GeometricField<Type, fvPatchField, volMesh>;
+
 typedef GeometricField<scalar, fvPatchField, volMesh> volScalarField;
 typedef GeometricField<vector, fvPatchField, volMesh> volVectorField;
 typedef GeometricField<sphericalTensor, fvPatchField, volMesh>
diff --git a/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
index f8d263f6d7..c2c612a920 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
@@ -97,11 +97,7 @@ void Foam::fv::semiImplicitSource::addSupType
     );
 
     // Explicit source function for the field
-    autoPtr<Function1<Type>> SuFun1
-    (
-         Function1<Type>::New("explicit", fieldDicts_[fieldi])
-    );
-    UIndirectList<Type>(Su, cells_) = SuFun1->value(t)/VDash_;
+    UIndirectList<Type>(Su, cells_) = fieldSu_[fieldi].value<Type>(t)/VDash_;
 
     volScalarField::Internal Sp
     (
@@ -124,11 +120,7 @@ void Foam::fv::semiImplicitSource::addSupType
     );
 
     // Implicit source function for the field
-    autoPtr<Function1<scalar>> SpFun1
-    (
-        Function1<scalar>::New("implicit", fieldDicts_[fieldi])
-    );
-    UIndirectList<scalar>(Sp, cells_) = SpFun1->value(t)/VDash_;
+    UIndirectList<scalar>(Sp, cells_) = fieldSp_[fieldi].value(t)/VDash_;
 
     eqn += Su + fvm::SuSp(Sp, psi);
 }
@@ -351,20 +343,37 @@ bool Foam::fv::semiImplicitSource::read(const dictionary& dict)
 
         const dictionary& sources = coeffs_.subDict("sources");
 
-        // Number of the fields with source term
+        // Number of fields with a source term
         const label nFields = sources.size();
 
-        // Names of the field
+        // Set field names and source terms
         fieldNames_.setSize(nFields);
-
-        // Field dicts
-        fieldDicts_.setSize(nFields);
-
+        fieldSp_.setSize(nFields);
+        fieldSu_.setSize(nFields);
         label i = 0;
         forAllConstIter(dictionary, sources, iter)
         {
             fieldNames_[i] = iter().keyword();
-            fieldDicts_[i] = iter().dict();
+            fieldSu_.set
+            (
+                i,
+                objectFunction1::New<VolField>
+                (
+                    "explicit",
+                    iter().dict(),
+                    fieldNames_[i],
+                    mesh_
+                ).ptr()
+            );
+            fieldSp_.set
+            (
+                i,
+                Function1<scalar>::New
+                (
+                    "implicit",
+                    iter().dict()
+                ).ptr()
+            );
             i++;
         }
 
diff --git a/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.H
index e95a8dd424..5359b92572 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.H
+++ b/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.H
@@ -94,6 +94,7 @@ SourceFiles
 
 #include "cellSetOption.H"
 #include "Function1.H"
+#include "objectFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -135,8 +136,11 @@ private:
         //- Volume normalisation
         scalar VDash_;
 
-        //- Explicit/Implicit source dicts
-        List<dictionary> fieldDicts_;
+        //- Explicit parts of the sources
+        PtrList<objectFunction1> fieldSu_;
+
+        //- Implicit parts of the sources
+        PtrList<Function1<scalar>> fieldSp_;
 
 
     // Private member functions

From ba0fe79c5fe0635867b8a70ec864d3d544f66096 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Sat, 11 Apr 2020 11:14:01 +0100
Subject: [PATCH 3/5] tutorials/.../DTCHull: Simplified and unified mesh setups

This also restores the upstream refinement in the wave case so that the
waves now correctly propagate to the hull
---
 .../multiphase/interFoam/RAS/DTCHull/Allclean |  4 +-
 .../multiphase/interFoam/RAS/DTCHull/Allmesh  |  8 +-
 .../multiphase/interFoam/RAS/DTCHull/Allrun   |  2 +-
 .../RAS/DTCHull/system/blockMeshDict          |  8 +-
 .../system/refineMeshDict.orig}               |  2 +-
 .../interFoam/RAS/DTCHull/system/topoSetDict  | 82 +++++++++++++++++++
 .../RAS/DTCHull/system/topoSetDict.1          | 32 --------
 .../RAS/DTCHull/system/topoSetDict.2          | 32 --------
 .../RAS/DTCHull/system/topoSetDict.3          | 32 --------
 .../RAS/DTCHull/system/topoSetDict.4          | 32 --------
 .../RAS/DTCHull/system/topoSetDict.5          | 32 --------
 .../RAS/DTCHull/system/topoSetDict.6          | 32 --------
 .../interFoam/RAS/DTCHullMoving/Allclean      |  1 -
 .../interFoam/RAS/DTCHullMoving/Allmesh       |  8 +-
 .../interFoam/RAS/DTCHullMoving/Allrun        |  2 +-
 .../RAS/DTCHullMoving/system/blockMeshDict    |  8 +-
 .../system/refineMeshDict.orig}               |  0
 .../RAS/DTCHullMoving/system/topoSetDict      | 82 +++++++++++++++++++
 .../RAS/DTCHullMoving/system/topoSetDict.1    | 32 --------
 .../RAS/DTCHullMoving/system/topoSetDict.2    | 32 --------
 .../RAS/DTCHullMoving/system/topoSetDict.3    | 32 --------
 .../RAS/DTCHullMoving/system/topoSetDict.4    | 32 --------
 .../RAS/DTCHullMoving/system/topoSetDict.5    | 32 --------
 .../RAS/DTCHullMoving/system/topoSetDict.6    | 32 --------
 .../interFoam/RAS/DTCHullWave/Allclean        |  1 -
 .../interFoam/RAS/DTCHullWave/Allmesh         |  8 +-
 .../interFoam/RAS/DTCHullWave/Allrun          |  2 +-
 .../RAS/DTCHullWave/system/blockMeshDict      |  8 +-
 .../RAS/DTCHullWave/system/controlDict        |  4 +-
 .../system/refineMeshDict.orig}               |  0
 .../RAS/DTCHullWave/system/topoSetDict        | 82 +++++++++++++++++++
 .../RAS/DTCHullWave/system/topoSetDict.1      | 32 --------
 .../RAS/DTCHullWave/system/topoSetDict.2      | 32 --------
 .../RAS/DTCHullWave/system/topoSetDict.3      | 32 --------
 .../RAS/DTCHullWave/system/topoSetDict.4      | 32 --------
 .../RAS/DTCHullWave/system/topoSetDict.5      | 32 --------
 .../RAS/DTCHullWave/system/topoSetDict.6      | 32 --------
 37 files changed, 277 insertions(+), 611 deletions(-)
 rename tutorials/multiphase/interFoam/RAS/{DTCHullWave/system/refineMeshDict => DTCHull/system/refineMeshDict.orig} (96%)
 create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
 rename tutorials/multiphase/interFoam/RAS/{DTCHull/system/refineMeshDict => DTCHullMoving/system/refineMeshDict.orig} (100%)
 create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
 rename tutorials/multiphase/interFoam/RAS/{DTCHullMoving/system/refineMeshDict => DTCHullWave/system/refineMeshDict.orig} (100%)
 create mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5
 delete mode 100644 tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6

diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
index 359e234386..26ecdefad0 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allclean
@@ -4,13 +4,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-# remove surface
+# Remove surface
 rm -f constant/triSurface/DTC-scaled.stl.gz > /dev/null 2>&1
 rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
 
 cleanCase
-rm constant/polyMesh/boundary > /dev/null 2>&1
-rm system/topoSetDict > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh
index fcbd69e971..d1b0eb5267 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allmesh
@@ -13,11 +13,11 @@ runApplication blockMesh
 
 for i in 1 2 3 4 5 6
 do
-    runApplication -s $i \
-        topoSet -dict system/topoSetDict.${i}
+    foamDictionary system/refineMeshDict -entry set -set c${i}
 
-    runApplication -s $i \
-        refineMesh -dict system/refineMeshDict -overwrite
+    runApplication -a topoSet
+
+    runApplication -a refineMesh -dict system/refineMeshDict -overwrite
 done
 
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
index 652426ec83..019517167b 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Mesh if necessary
-if ! cloneMesh ../DTCHullMoving . && ! cloneMesh ../DTCHullWave .
+if ! cloneMesh ../DTCHullMoving . && ! (isTest $@ && cloneMesh ../DTCHullWave .)
 then
     ./Allmesh
 fi
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
index 9e6f42708d..58e84e3501 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/blockMeshDict
@@ -28,10 +28,10 @@ vertices
     (16 0 -1)
     (-26 0 -1)
 
-    (-26 -19 0.185)
-    (16 -19 0.185)
-    (16 0 0.185)
-    (-26 0 0.185)
+    (-26 -19 0.188)
+    (16 -19 0.188)
+    (16 0 0.188)
+    (-26 0 0.188)
 
     (-26 -19 0.244)
     (16 -19 0.244)
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig
similarity index 96%
rename from tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict
rename to tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig
index d85a027842..341d5de2c7 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig
@@ -31,7 +31,7 @@ patchLocalCoeffs
     tan1            (1 0 0);
 }
 
-directions      ( tan1 tan2 );
+directions      (tan1 tan2);
 
 useHexTopology  no;
 
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict
new file mode 100644
index 0000000000..c39df43591
--- /dev/null
+++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict
@@ -0,0 +1,82 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    c1;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-10 -6 -3) (10 0 3);
+        }
+    }
+    {
+        name    c2;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-5 -3 -2.5) (9 0 2);
+        }
+    }
+    {
+        name    c3;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-3 -1.5 -1) (8 0 1.5);
+        }
+    }
+    {
+        name    c4;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-2 -1 -0.6) (7 0 1);
+        }
+    }
+    {
+        name    c5;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-1 -0.6 -0.3) (6.5 0 0.8);
+        }
+    }
+    {
+        name    c6;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-0.5 -0.55 -0.15) (6.25 0 0.65);
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
deleted file mode 100644
index dfab923dbf..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.1
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-10 -6 -3) (10 0 3);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
deleted file mode 100644
index 4356c182fc..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.2
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-5 -3 -2.5) (9 0 2);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
deleted file mode 100644
index 63fb7f97f5..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.3
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-3 -1.5 -1) (8 0 1.5);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
deleted file mode 100644
index d5dd15bc75..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.4
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-2 -1 -0.6) (7 0 1);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
deleted file mode 100644
index a8ec025bf0..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.5
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-1 -0.6 -0.3) (6.5 0 0.8);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
deleted file mode 100644
index aecdb00415..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/topoSetDict.6
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-0.5 -0.55 -0.15) (6.25 0 0.65);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean
index 1416cad21f..26ecdefad0 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allclean
@@ -10,6 +10,5 @@ rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
 
 cleanCase
-rm system/topoSetDict > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh
index fcbd69e971..d1b0eb5267 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allmesh
@@ -13,11 +13,11 @@ runApplication blockMesh
 
 for i in 1 2 3 4 5 6
 do
-    runApplication -s $i \
-        topoSet -dict system/topoSetDict.${i}
+    foamDictionary system/refineMeshDict -entry set -set c${i}
 
-    runApplication -s $i \
-        refineMesh -dict system/refineMeshDict -overwrite
+    runApplication -a topoSet
+
+    runApplication -a refineMesh -dict system/refineMeshDict -overwrite
 done
 
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun
index f07bca0c11..256c79d2e8 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Mesh if necessary
-if ! cloneMesh ../DTCHull . && ! cloneMesh ../DTCHullWave .
+if ! cloneMesh ../DTCHull . && ! (isTest $@ && cloneMesh ../DTCHullWave .)
 then
     ./Allmesh
 fi
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
index 9e6f42708d..58e84e3501 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/blockMeshDict
@@ -28,10 +28,10 @@ vertices
     (16 0 -1)
     (-26 0 -1)
 
-    (-26 -19 0.185)
-    (16 -19 0.185)
-    (16 0 0.185)
-    (-26 0 0.185)
+    (-26 -19 0.188)
+    (16 -19 0.188)
+    (16 0 0.188)
+    (-26 0 0.188)
 
     (-26 -19 0.244)
     (16 -19 0.244)
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig
similarity index 100%
rename from tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict
rename to tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict
new file mode 100644
index 0000000000..c39df43591
--- /dev/null
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict
@@ -0,0 +1,82 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    c1;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-10 -6 -3) (10 0 3);
+        }
+    }
+    {
+        name    c2;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-5 -3 -2.5) (9 0 2);
+        }
+    }
+    {
+        name    c3;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-3 -1.5 -1) (8 0 1.5);
+        }
+    }
+    {
+        name    c4;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-2 -1 -0.6) (7 0 1);
+        }
+    }
+    {
+        name    c5;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-1 -0.6 -0.3) (6.5 0 0.8);
+        }
+    }
+    {
+        name    c6;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-0.5 -0.55 -0.15) (6.25 0 0.65);
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
deleted file mode 100644
index dfab923dbf..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.1
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-10 -6 -3) (10 0 3);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
deleted file mode 100644
index 4356c182fc..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.2
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-5 -3 -2.5) (9 0 2);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
deleted file mode 100644
index 63fb7f97f5..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.3
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-3 -1.5 -1) (8 0 1.5);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
deleted file mode 100644
index d5dd15bc75..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.4
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-2 -1 -0.6) (7 0 1);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
deleted file mode 100644
index a8ec025bf0..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.5
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-1 -0.6 -0.3) (6.5 0 0.8);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
deleted file mode 100644
index aecdb00415..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/topoSetDict.6
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-0.5 -0.55 -0.15) (6.25 0 0.65);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean
index 1416cad21f..26ecdefad0 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allclean
@@ -10,6 +10,5 @@ rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
 rm -f constant/triSurface/DTC-scaled.eMesh > /dev/null 2>&1
 
 cleanCase
-rm system/topoSetDict > /dev/null 2>&1
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh
index fcbd69e971..d1b0eb5267 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allmesh
@@ -13,11 +13,11 @@ runApplication blockMesh
 
 for i in 1 2 3 4 5 6
 do
-    runApplication -s $i \
-        topoSet -dict system/topoSetDict.${i}
+    foamDictionary system/refineMeshDict -entry set -set c${i}
 
-    runApplication -s $i \
-        refineMesh -dict system/refineMeshDict -overwrite
+    runApplication -a topoSet
+
+    runApplication -a refineMesh -dict system/refineMeshDict -overwrite
 done
 
 runApplication snappyHexMesh -overwrite
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun
index a4111e0e3d..974d9ad03b 100755
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/Allrun
@@ -5,7 +5,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
 # Mesh if necessary
-if ! cloneMesh ../DTCHull . && ! cloneMesh ../DTCHullMoving .
+if ! isTest $@ || ! cloneMesh ../DTCHull . && ! cloneMesh ../DTCHullMoving .
 then
     ./Allmesh
 fi
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict
index 9e6f42708d..58e84e3501 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/blockMeshDict
@@ -28,10 +28,10 @@ vertices
     (16 0 -1)
     (-26 0 -1)
 
-    (-26 -19 0.185)
-    (16 -19 0.185)
-    (16 0 0.185)
-    (-26 0 0.185)
+    (-26 -19 0.188)
+    (16 -19 0.188)
+    (16 0 0.188)
+    (-26 0 0.188)
 
     (-26 -19 0.244)
     (16 -19 0.244)
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict
index b7b901cbd8..681acfc8e9 100644
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/controlDict
@@ -47,8 +47,8 @@ runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
-maxCo           20;
-maxAlphaCo      15;
+maxCo           10;
+maxAlphaCo      5;
 maxDeltaT       0.01;
 
 libs            ("libwaves.so");
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig
similarity index 100%
rename from tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict
rename to tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict
new file mode 100644
index 0000000000..bfb5c4a5b9
--- /dev/null
+++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict
@@ -0,0 +1,82 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Version:  dev
+     \\/     M anipulation  |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      topoSetDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+actions
+(
+    {
+        name    c1;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-10 -6 -3) (16 0 3);
+        }
+    }
+    {
+        name    c2;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-5 -3 -2.5) (16 0 2);
+        }
+    }
+    {
+        name    c3;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-3 -1.5 -1) (16 0 1.5);
+        }
+    }
+    {
+        name    c4;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-2 -1 -0.6) (16 0 1);
+        }
+    }
+    {
+        name    c5;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-1 -0.6 -0.3) (6.5 0 0.8);
+        }
+    }
+    {
+        name    c6;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
+        sourceInfo
+        {
+            box (-0.5 -0.55 -0.15) (6.25 0 0.65);
+        }
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1
deleted file mode 100644
index dfab923dbf..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.1
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-10 -6 -3) (10 0 3);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2
deleted file mode 100644
index 4356c182fc..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.2
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-5 -3 -2.5) (9 0 2);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3
deleted file mode 100644
index 63fb7f97f5..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.3
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-3 -1.5 -1) (8 0 1.5);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4
deleted file mode 100644
index d5dd15bc75..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.4
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-2 -1 -0.6) (7 0 1);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5
deleted file mode 100644
index a8ec025bf0..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.5
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-1 -0.6 -0.3) (6.5 0 0.8);
-        }
-    }
-);
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6 b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6
deleted file mode 100644
index aecdb00415..0000000000
--- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/topoSetDict.6
+++ /dev/null
@@ -1,32 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  dev
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      topoSetDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-actions
-(
-    {
-        name    c0;
-        type    cellSet;
-        action  new;
-        source  boxToCell;
-        sourceInfo
-        {
-            box (-0.5 -0.55 -0.15) (6.25 0 0.65);
-        }
-    }
-);
-
-// ************************************************************************* //

From d9103613a93eac139811373138042203fe497f70 Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Tue, 14 Apr 2020 09:19:55 +0100
Subject: [PATCH 4/5] bin/tools: Added version number comparison script

This script allows version numbers to be compared. It is called in the
following way:

    foamVersionCompare <version-1> <comparison> <version-2>

The <comparison> argument can be one of; eq (equal-to), lt (less-than),
gt (greater-than), le (less-than-or-equal-to), or ge
(greater-than-or-equal-to). The script returns a successful exit code if
the comparison evaluates as true.

Example usage:

    if $WM_PROJECT_DIR/bin/tools/foamVersionCompare 5.4.3 gt 5.5.1
    then
        echo "5.4.3 IS greater than 5.5.1"
    else
        echo "5.4.3 is NOT greater than 5.5.1"
    fi
---
 bin/tools/foamVersionCompare | 156 +++++++++++++++++++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100755 bin/tools/foamVersionCompare

diff --git a/bin/tools/foamVersionCompare b/bin/tools/foamVersionCompare
new file mode 100755
index 0000000000..e9879440e2
--- /dev/null
+++ b/bin/tools/foamVersionCompare
@@ -0,0 +1,156 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     | Website:  https://openfoam.org
+#   \\  /    A nd           | Copyright (C) 2020 OpenFOAM Foundation
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     foamVersionCompare
+#
+# Description
+#     Compare two version numbers
+#
+#------------------------------------------------------------------------------
+
+usage() {
+    cat<<USAGE
+
+Usage: ${0##*/} <version-1> <comparison> <version-2>
+
+Compare two version numbers. The <comparison> argument can be one of; eq
+(equal-to), lt (less-than), gt (greater-than), le (less-than-or-equal-to), or
+ge (greater-than-or-equal-to). Returns a successful exit code if true.
+
+Examples:
+    foamVersionCompare 5.4.3 gt 5.5.1
+    foamVersionCompare 5.4.3 gt 5.5.1 && echo True || echo False
+    if foamVersionCompare 5.4.3 gt 5.5.1
+    then
+        echo "5.4.3 IS greater than 5.5.1"
+    else
+        echo "5.4.3 is NOT greater than 5.5.1"
+    fi
+
+USAGE
+}
+
+error() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    usage
+    exit 1
+}
+
+# Comparison functions
+_foamVersionCompare_eq=0
+_foamVersionCompare_lt=1
+_foamVersionCompare_gt=2
+_foamVersionCompare()
+{
+    a=$1.
+    b=$2.
+
+    while [ -n "$a" ] || [ -n "$b" ]
+    do
+        ai="${a%%.*}"
+        bi="${b%%.*}"
+
+        [ -z "$ai" ] && ai=0
+        [ -z "$bi" ] && bi=0
+
+        if [ "$ai" -lt "$bi" ]
+        then
+            return $_foamVersionCompare_lt
+        fi
+
+        if [ "$ai" -gt "$bi" ]
+        then
+            return $_foamVersionCompare_gt
+        fi
+
+        a="${a#*.}"
+        b="${b#*.}"
+    done
+
+    return $_foamVersionCompare_eq
+}
+_foamVersionEq()
+{
+    _foamVersionCompare "$1" "$2"
+    [ $? = $_foamVersionCompare_eq ] && return 0 || return 1
+}
+_foamVersionLt()
+{
+    _foamVersionCompare "$1" "$2"
+    [ $? = $_foamVersionCompare_lt ] && return 0 || return 1
+}
+_foamVersionGt()
+{
+    _foamVersionCompare "$1" "$2"
+    [ $? = $_foamVersionCompare_gt ] && return 0 || return 1
+}
+_foamVersionLe()
+{
+    _foamVersionCompare "$1" "$2"
+    [ $? != $_foamVersionCompare_gt ] && return 0 || return 1
+}
+_foamVersionGe()
+{
+    _foamVersionCompare "$1" "$2"
+    [ $? != $_foamVersionCompare_lt ] && return 0 || return 1
+}
+
+# Parse arguments
+[ $# -eq 3 ] || error "Incorrect arguments specified"
+
+v1=$1
+shift 1
+
+case $1 in
+    -h | -help)
+        usage && exit 0
+        ;;
+    eq)
+        compare=_foamVersionEq
+        ;;
+    lt)
+        compare=_foamVersionLt
+        ;;
+    gt)
+        compare=_foamVersionGt
+        ;;
+    le)
+        compare=_foamVersionLe
+        ;;
+    ge)
+        compare=_foamVersionGe
+        ;;
+    *)
+        error "unknown option: '$*'";
+        ;;
+esac
+shift 1
+
+v2=$1
+shift 1
+
+# Perform comparison and return
+$compare "$v1" "$v2" && exit 0 || exit 1

From a4efd0ed55e21d4ea125bd20f5412737e431991f Mon Sep 17 00:00:00 2001
From: Will Bainbridge <http://cfd.direct>
Date: Tue, 14 Apr 2020 12:18:06 +0100
Subject: [PATCH 5/5] paraview: Corrected library paths

---
 etc/config.csh/paraview | 11 ++++++-----
 etc/config.sh/paraview  | 14 +++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/etc/config.csh/paraview b/etc/config.csh/paraview
index 3dc8ef1f1c..3e294f0437 100644
--- a/etc/config.csh/paraview
+++ b/etc/config.csh/paraview
@@ -52,7 +52,6 @@ foreach cmake ( cmake-3.2.1 cmake-2.8.12.1 cmake-2.8.8 cmake-2.8.4 cmake-2.8.3 c
 end
 
 #- ParaView version, automatically determine major version:
-#setenv ParaView_VERSION 3.12.0
 #setenv ParaView_VERSION 4.0.1
 #setenv ParaView_VERSION 4.1.0
 #setenv ParaView_VERSION 4.3.1
@@ -102,11 +101,13 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraview
 # Set paths if binaries or source are present
 if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
     setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
-    if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview-3.0) then
-        setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-3.0
-    endif
 
-    set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}
+    $WM_PROJECT_DIR/bin/tools/foamVersionCompare $ParaView_VERSION ge 5.5.0
+    if ( $status == 0 ) then
+        setenv ParaView_LIB_DIR ${ParaView_DIR}/lib*
+    else
+        setenv ParaView_LIB_DIR ${ParaView_DIR}/lib*/paraview-${ParaView_MAJOR}
+    endif
 
     setenv PATH ${ParaView_DIR}/bin:${PATH}
     setenv LD_LIBRARY_PATH "${ParaView_LIB_DIR}:${LD_LIBRARY_PATH}"
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 0225f47019..3191c4bb96 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     | Website:  https://openfoam.org
-#   \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -58,7 +58,6 @@ done
 
 
 #- ParaView version, automatically determine major version
-#export ParaView_VERSION=3.12.0
 #export ParaView_VERSION=4.0.1
 #export ParaView_VERSION=4.1.0
 #export ParaView_VERSION=4.3.1
@@ -116,12 +115,13 @@ export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$paraview
 if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
 then
     export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
-    if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview-3.0 ]
-    then
-        export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-3.0
-    fi
 
-    ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
+    if $WM_PROJECT_DIR/bin/tools/foamVersionCompare $ParaView_VERSION ge 5.5.0
+    then
+        export ParaView_LIB_DIR=$ParaView_DIR/lib*
+    else
+        export ParaView_LIB_DIR=$ParaView_DIR/lib*/paraview-$ParaView_MAJOR
+    fi
 
     export PATH=$ParaView_DIR/bin:$PATH
     export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH