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
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
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);
-        }
-    }
-);
-
-// ************************************************************************* //