From fbbf9064b914a278b266428ee451bf631499bef5 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 20 Feb 2020 08:28:16 +0100
Subject: [PATCH] STYLE: remove trailing space, shell quoting

- emit "constant " and "uniform " as separate word/space combination
---
 .../cumulativeDisplacement/cumulativeDisplacement.C |  2 +-
 .../preProcessing/PDRsetFields/PDRarraysCalc.C      |  5 +++--
 .../PatchFunction1/ConstantField/ConstantField.C    |  4 ++--
 tutorials/combustion/XiEngineFoam/kivaTest/Allclean |  4 ++--
 .../pimpleFoam/laminar/contactAngleCavity/Allrun    |  2 +-
 .../laminar/contaminatedDroplet2D/Allclean          |  2 +-
 .../pimpleFoam/laminar/contaminatedDroplet2D/Allrun |  2 +-
 .../pimpleFoam/laminar/sloshing2D/Allclean          |  6 +++---
 .../pimpleFoam/laminar/sloshing2D/Allrun            |  5 +++--
 .../laminar/sloshing2D/system/blockMeshDict         |  2 +-
 .../laminar/sloshing2D/system/controlDict           |  2 +-
 .../laminar/sloshing2D/system/decomposeParDict      |  2 +-
 .../pimpleFoam/laminar/sloshing2D/system/faSchemes  |  2 +-
 .../pimpleFoam/laminar/sloshing2D/system/faSolution |  2 +-
 .../pimpleFoam/laminar/sloshing2D/system/fvSchemes  |  2 +-
 .../pimpleFoam/laminar/sloshing2D/system/fvSolution |  2 +-
 .../simpleFoam/turbulentFlatPlate/0.kEpsilon/k      |  2 +-
 .../simpleFoam/turbulentFlatPlate/0.kOmegaSST/k     |  2 +-
 .../simpleFoam/turbulentFlatPlate/Allclean          |  4 ++--
 .../laminar/waves/waveMakerMultiPaddleFlap/Allclean |  5 +++--
 .../laminar/waves/waveMakerMultiPaddleFlap/Allrun   |  5 +++--
 .../waves/waveMakerMultiPaddlePiston/Allclean       |  5 +++--
 .../laminar/waves/waveMakerMultiPaddlePiston/Allrun |  5 +++--
 .../stefanProblem/Allclean                          | 13 ++++++-------
 .../stefanProblem/Allrun                            |  4 ++--
 .../stefanProblem/Allclean                          | 13 ++++++-------
 .../stefanProblem/Allrun                            |  4 ++--
 .../weightedFluxExample/system/blockMeshDict        |  2 +-
 .../weightedFluxExample/system/controlDict.template |  2 +-
 .../weightedFluxExample/system/fvSchemes.template   |  2 +-
 .../schemes/weightedFluxExample/system/fvSolution   |  2 +-
 .../weightedFluxExample/system/setFieldsDict        |  2 +-
 .../schemes/weightedFluxExample/system/singleGraph  |  2 +-
 33 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C b/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C
index 703c8c40fe5..86aacf01d8f 100644
--- a/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C
+++ b/applications/utilities/postProcessing/optimisation/cumulativeDisplacement/cumulativeDisplacement.C
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
             {
                 label pointI = localPoints[ppI];
                 normalDisplacement[pointI]  =
-                    (meshPoints[pointI] - points0[pointI]) 
+                    (meshPoints[pointI] - points0[pointI])
                   & pointNormals[pointI];
             }
         }
diff --git a/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C b/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C
index e74ff71d7d6..a4d8f73f494 100644
--- a/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C
+++ b/applications/utilities/preProcessing/PDRsetFields/PDRarraysCalc.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016 Shell Research Ltd.
-    Copyright (C) 2019 OpenCFD Ltd.
+    Copyright (C) 2019-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -185,7 +185,8 @@ static inline scalar averageSurrounding
 template<class Type>
 static inline Ostream& putUniform(Ostream& os, const word& key, const Type& val)
 {
-    os.writeKeyword(key) << "uniform " << val << token::END_STATEMENT << nl;
+    os.writeKeyword(key) << word("uniform") << token::SPACE
+        << val << token::END_STATEMENT << nl;
     return os;
 }
 
diff --git a/src/meshTools/PatchFunction1/ConstantField/ConstantField.C b/src/meshTools/PatchFunction1/ConstantField/ConstantField.C
index 0c5b332540c..5317ff80533 100644
--- a/src/meshTools/PatchFunction1/ConstantField/ConstantField.C
+++ b/src/meshTools/PatchFunction1/ConstantField/ConstantField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2019 OpenCFD Ltd.
+    Copyright (C) 2018-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -259,7 +259,7 @@ void Foam::PatchFunction1Types::ConstantField<Type>::writeData
     if (isUniform_)
     {
         os.writeKeyword(this->name_)
-            << "constant " << uniformValue_
+            << word("constant") << token::SPACE << uniformValue_
             << token::END_STATEMENT << nl;
     }
     else
diff --git a/tutorials/combustion/XiEngineFoam/kivaTest/Allclean b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean
index a1c40f94583..dcc2f42cf2f 100755
--- a/tutorials/combustion/XiEngineFoam/kivaTest/Allclean
+++ b/tutorials/combustion/XiEngineFoam/kivaTest/Allclean
@@ -4,9 +4,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 mv ./-180 temp180
-cleanCase
 
-rm -rf 0
+cleanCase0
+
 rm -f constant/polyMesh/boundary
 
 mv temp180 ./-180
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/Allrun b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/Allrun
index d9f14c4ae34..8f8e20feb54 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/Allrun
+++ b/tutorials/incompressible/pimpleFoam/laminar/contactAngleCavity/Allrun
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit                                  # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allclean b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allclean
index 7a400f64412..25a4c2d141e 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allclean
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allclean
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit                                  # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allrun b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allrun
index 5c6a4d2b9bf..cedcdfc372a 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allrun
+++ b/tutorials/incompressible/pimpleFoam/laminar/contaminatedDroplet2D/Allrun
@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit                                  # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allclean b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allclean
index ef319aa5cd5..928ea41850c 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allclean
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allclean
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
 
 cleanCase
 
@@ -12,5 +13,4 @@ cleanFaMesh
 
 rm -r history
 
-
 #------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allrun b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allrun
index 9b248e435ca..fdd5a79e9e0 100755
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allrun
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/Allrun
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
 
 runApplication blockMesh
 runApplication makeFaMesh
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict
index f137291a3e1..ea891d2dcde 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
index 0ea70faea5f..2564cecb7cb 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict
index 8e34ee1400e..680a2ef498e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes
index 6bfc17b4975..c8ac8b7f20e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution
index 99bb0c9f3ce..9b304ceeb57 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/faSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes
index 56d749b3ac3..2b36d2e476e 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
index 366758d0658..08b2d2c22a4 100644
--- a/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
+++ b/tutorials/incompressible/pimpleFoam/laminar/sloshing2D/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/k b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/k
index e0a411195c5..a6125bb056e 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/k
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/k
@@ -49,7 +49,7 @@ boundaryField
     {
         type            symmetryPlane;
     }
-  
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/k b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/k
index e0a411195c5..a6125bb056e 100644
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/k
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/k
@@ -49,7 +49,7 @@ boundaryField
     {
         type            symmetryPlane;
     }
-  
+
     frontAndBack
     {
         type            empty;
diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean
index e74fa2de91a..0506c7d945b 100755
--- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean
+++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/Allclean
@@ -3,9 +3,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
-rm -rf 0 postProcessing-*
+rm -rf postProcessing-*
 rm -f *.dat *.png constant/turbulenceProperties
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allclean
index e2f275d9fd6..fb1f3847301 100755
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allclean
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
 
 cleanCase0
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allrun
index 28bf991e627..4f259966c51 100755
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddleFlap/Allrun
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
 
 restore0Dir
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allclean b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allclean
index e2f275d9fd6..fb1f3847301 100755
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allclean
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allclean
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions  # Tutorial clean functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
 
 cleanCase0
 
diff --git a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allrun b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allrun
index 28bf991e627..4f259966c51 100755
--- a/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allrun
+++ b/tutorials/multiphase/interFoam/laminar/waves/waveMakerMultiPaddlePiston/Allrun
@@ -1,6 +1,7 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                        # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions    # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
+#------------------------------------------------------------------------------
 
 restore0Dir
 
diff --git a/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allclean b/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allclean
index f576c0f68a1..71fef7884c2 100755
--- a/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allclean
+++ b/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allclean
@@ -1,12 +1,11 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
 
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase0
 
-cleanCase
-rm -rf 0
-rm positionClean.dat
-rm OF_vs_Exact.eps
+rm -f positionClean.dat
+rm -f OF_vs_Exact.eps
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allrun b/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allrun
index ac16a2c2e91..9c12c704084 100755
--- a/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allrun
+++ b/tutorials/verificationAndValidation/icoReactingMultiphaseInterFoam/stefanProblem/Allrun
@@ -1,6 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions            # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
diff --git a/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allclean b/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allclean
index f576c0f68a1..71fef7884c2 100755
--- a/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allclean
+++ b/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allclean
@@ -1,12 +1,11 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
+#------------------------------------------------------------------------------
 
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cleanCase0
 
-cleanCase
-rm -rf 0
-rm positionClean.dat
-rm OF_vs_Exact.eps
+rm -f positionClean.dat
+rm -f OF_vs_Exact.eps
 
 #------------------------------------------------------------------------------
diff --git a/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allrun b/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allrun
index f508a34e2ba..b0f402edac2 100755
--- a/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allrun
+++ b/tutorials/verificationAndValidation/interCondensatingEvaporatingFoam/stefanProblem/Allrun
@@ -1,6 +1,6 @@
 #!/bin/sh
-cd ${0%/*} || exit 1                                # Run from this directory
-. $WM_PROJECT_DIR/bin/tools/RunFunctions            # Tutorial run functions
+cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
 runApplication blockMesh
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict
index 6f60948134f..2c67bcc02fb 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/blockMeshDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template
index 8076b8e8a91..fe1d3a01d85 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/controlDict.template
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template
index 3cfbac54f57..c08d3d76659 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSchemes.template
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution
index e9b4e33f1a3..b68ea26c000 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict
index f4dbb22c4df..d081e2f99e2 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph
index 6139c9e90fb..b62f42270ae 100644
--- a/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph
+++ b/tutorials/verificationAndValidation/schemes/weightedFluxExample/system/singleGraph
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  v1912                                 |
-|   \\  /    A nd           | Website:  www.OpenFOAM.com                      |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 
-- 
GitLab