From bab72d5139d85d21768f4c0ab40345ca27623b7c Mon Sep 17 00:00:00 2001
From: Johan Roenby <johan.roenby@gmail.com>
Date: Tue, 12 Jun 2018 23:14:10 +0200
Subject: [PATCH] ENH: multiple updates to interIsoFoam related code

- Updated tutorial headers
- Added copyright note to isoAdvector src
- Removed outcommented code lines in interIsoFoam solver
- Removed all LTS from interIsoFoam since this is not currently supported
- Confirmed that discInConstantFlow gives identical results with N subCylces and time step N*dt
- Confirmed that this also holds when nOuterCorrectors > 1.
---
 .../multiphase/interIsoFoam/alphaControls.H   |  26 ----
 .../multiphase/interIsoFoam/alphaEqn.H        |  97 +++++++------
 .../interIsoFoam/alphaEqnSubCycle.H           |   8 --
 .../multiphase/interIsoFoam/alphaSuSp.H       |   3 -
 .../multiphase/interIsoFoam/createFields.H    |  20 ---
 .../multiphase/interIsoFoam/interIsoFoam.C    |  28 +---
 .../multiphase/interIsoFoam/setRDeltaT.H      | 136 ------------------
 .../isoAdvection/isoAdvection/isoAdvection.C  |   1 +
 .../isoAdvection/isoAdvection/isoAdvection.H  |   1 +
 .../isoAdvection/isoCutCell/isoCutCell.C      |   1 +
 .../isoAdvection/isoCutCell/isoCutCell.H      |   1 +
 .../isoAdvection/isoCutFace/isoCutFace.C      |   1 +
 .../isoAdvection/isoCutFace/isoCutFace.H      |   1 +
 .../damBreakWithObstacle/0.orig/U             |   4 +-
 .../damBreakWithObstacle/0.orig/alpha.water   |   4 +-
 .../damBreakWithObstacle/0.orig/p_rgh         |   4 +-
 .../constant/dynamicMeshDict                  |   4 +-
 .../damBreakWithObstacle/constant/g           |   4 +-
 .../constant/transportProperties              |   4 +-
 .../constant/turbulenceProperties             |   4 +-
 .../damBreakWithObstacle/system/blockMeshDict |   4 +-
 .../damBreakWithObstacle/system/controlDict   |   4 +-
 .../system/decomposeParDict                   |   4 +-
 .../damBreakWithObstacle/system/fvSchemes     |   4 +-
 .../damBreakWithObstacle/system/fvSolution    |   4 +-
 .../damBreakWithObstacle/system/setFieldsDict |   4 +-
 .../damBreakWithObstacle/system/topoSetDict   |   4 +-
 .../discInConstantFlowCyclicBCs/0.orig/U      |   3 +-
 .../constant/dynamicMeshDict                  |   3 +-
 .../discInConstantFlowCyclicBCs/constant/g    |   3 +-
 .../constant/transportProperties              |   3 +-
 .../constant/turbulenceProperties             |   3 +-
 .../system/blockMeshDict                      |   3 +-
 .../system/controlDict                        |   3 +-
 .../system/decomposeParDict                   |   3 +-
 .../system/fvSchemes                          |   3 +-
 .../system/fvSolution                         |   3 +-
 .../system/setAlphaFieldDict                  |   3 +-
 38 files changed, 111 insertions(+), 302 deletions(-)
 delete mode 100644 applications/solvers/multiphase/interIsoFoam/alphaSuSp.H
 delete mode 100644 applications/solvers/multiphase/interIsoFoam/setRDeltaT.H

diff --git a/applications/solvers/multiphase/interIsoFoam/alphaControls.H b/applications/solvers/multiphase/interIsoFoam/alphaControls.H
index ebe73c3c2c4..db77d94af4d 100644
--- a/applications/solvers/multiphase/interIsoFoam/alphaControls.H
+++ b/applications/solvers/multiphase/interIsoFoam/alphaControls.H
@@ -1,29 +1,3 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 
-//label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
-
 label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-
-/*
-bool MULESCorr(alphaControls.lookupOrDefault("MULESCorr", false));
-
-// Apply the compression correction from the previous iteration
-// Improves efficiency for steady-simulations but can only be applied
-// once the alpha field is reasonably steady, i.e. fully developed
-bool alphaApplyPrevCorr
-(
-    alphaControls.lookupOrDefault("alphaApplyPrevCorr", false)
-);
-
-// Isotropic compression coefficient
-scalar icAlpha
-(
-    alphaControls.lookupOrDefault<scalar>("icAlpha", 0)
-);
-
-// Shear compression coefficient
-scalar scAlpha
-(
-    alphaControls.lookupOrDefault<scalar>("scAlpha", 0)
-);
-*/
diff --git a/applications/solvers/multiphase/interIsoFoam/alphaEqn.H b/applications/solvers/multiphase/interIsoFoam/alphaEqn.H
index 1bda9eef188..a73391a996b 100644
--- a/applications/solvers/multiphase/interIsoFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interIsoFoam/alphaEqn.H
@@ -1,50 +1,53 @@
+{
+    // Note for AMR implementation:
+    // At this point we have just entered the new time step,
+    // the mesh has been refined and the alpha, phi and U contain
+    // the field values at the beginning of this time step mapped
+    // to the new mesh.
+
+    // The above assumes that we are in firstIter() of the outer
+    // corrector loop. If we are in any subsequent iter of this loop
+    // the alpha1, U and phi will be overwritten with the new time step
+    // values but still on the same mesh.
+
+
+    if (pimple.firstIter())
     {
-        // Note for AMR implementation:
-        // At this point we have just entered the new time step,
-        // the mesh has been refined and the alpha, phi and U contain
-        // the field values at the beginning of this time step mapped
-        // to the new mesh.
-
-        // The above assumes that we are in firstIter() of the outer
-        // corrector loop. If we are in any subsequent iter of this loop
-        // the alpha1, U and phi will be overwritten with the new time step
-        // values but still on the same mesh.
-
-
-        if (pimple.firstIter())
-        {
-            // Note: This assumes moveMeshOuterCorrectors is false
-            alpha10 = alpha1;
-            U0 = U;
-            phi0 = phi;
-            advector.advect();
-
-            #include "rhofs.H"
-            rhoPhi = advector.getRhoPhi(rho1f, rho2f);
-        }
-        else
-        {
-            alpha1 = alpha10;
-            // Temporarily setting U and phi to average of old and new value
-            // Note: Illegal additions if mesh is topoChanging
-            // (e.g. if moveMeshOuterCorrectors and AMR)
-            U = 0.5*U0 + 0.5*U;
-            phi = 0.5*phi0 + 0.5*phi;
-            isoAdvection advector(alpha1, phi, U);
-            advector.advect();
-            #include "rhofs.H"
-            rhoPhi = advector.getRhoPhi(rho1f, rho2f);
-            // Resetting U and phi to the new value
-            U = 2.0*U - U0;
-            phi = 2.0*phi - phi0;
-        }
-
-        alpha2 = 1.0 - alpha1;
-        mixture.correct();
+        // Note: This assumes moveMeshOuterCorrectors is false
+        // Saving field values before advection in first PIMPLE iteration
+        alpha10 = alpha1;
+        U0 = U;
+        phi0 = phi;
+    }
+    else
+    {
+        // Resetting alpha1 to value before advection in first PIMPLE iteration
+        alpha1 = alpha10;
+        // Temporarily setting U and phi to average of old and new value
+        // Note: Illegal additions if mesh is topoChanging
+        // (e.g. if moveMeshOuterCorrectors and AMR)
+        U = 0.5*U0 + 0.5*U;
+        phi = 0.5*phi0 + 0.5*phi;
+    }
 
+    advector.advect();
+    #include "rhofs.H"
+    rhoPhi = advector.getRhoPhi(rho1f, rho2f);
+
+    if (!pimple.firstIter())
+    {
+        // Resetting U and phi to the new value
+        U = 2.0*U - U0;
+        phi = 2.0*phi - phi0;
     }
-    Info<< "Phase-1 volume fraction = "
-        << alpha1.weightedAverage(mesh.Vsc()).value()
-        << "  Min(" << alpha1.name() << ") = " << min(alpha1).value()
-        << "  Max(" << alpha1.name() << ") = " << max(alpha1).value()
-        << endl;
+
+    alpha2 = 1.0 - alpha1;
+    mixture.correct();
+
+}
+
+Info<< "Phase-1 volume fraction = "
+    << alpha1.weightedAverage(mesh.Vsc()).value()
+    << "  Min(" << alpha1.name() << ") = " << min(alpha1).value()
+    << "  Max(" << alpha1.name() << ") = " << max(alpha1).value()
+    << endl;
diff --git a/applications/solvers/multiphase/interIsoFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/interIsoFoam/alphaEqnSubCycle.H
index c53d6e106b4..3c8ba18f2ba 100644
--- a/applications/solvers/multiphase/interIsoFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/interIsoFoam/alphaEqnSubCycle.H
@@ -13,14 +13,6 @@ if (nAlphaSubCycles > 1)
         dimensionedScalar(rhoPhi.dimensions(), Zero)
     );
 
-    tmp<volScalarField> trSubDeltaT;
-
-    if (LTS)
-    {
-        trSubDeltaT =
-            fv::localEulerDdt::localRSubDeltaT(mesh, nAlphaSubCycles);
-    }
-
     for
     (
         subCycle<volScalarField> alphaSubCycle(alpha1, nAlphaSubCycles);
diff --git a/applications/solvers/multiphase/interIsoFoam/alphaSuSp.H b/applications/solvers/multiphase/interIsoFoam/alphaSuSp.H
deleted file mode 100644
index 0b8e05e1871..00000000000
--- a/applications/solvers/multiphase/interIsoFoam/alphaSuSp.H
+++ /dev/null
@@ -1,3 +0,0 @@
-zeroField Su;
-zeroField Sp;
-zeroField divU;
diff --git a/applications/solvers/multiphase/interIsoFoam/createFields.H b/applications/solvers/multiphase/interIsoFoam/createFields.H
index 02269e379a7..76b99381077 100644
--- a/applications/solvers/multiphase/interIsoFoam/createFields.H
+++ b/applications/solvers/multiphase/interIsoFoam/createFields.H
@@ -121,23 +121,6 @@ if (p_rgh.needReference())
 mesh.setFluxRequired(p_rgh.name());
 mesh.setFluxRequired(alpha1.name());
 
-/*
-// MULES compressed flux is registered in case scalarTransport FO needs it.
-surfaceScalarField alphaPhiUn
-(
-    IOobject
-    (
-        "alphaPhiUn",
-        runTime.timeName(),
-        mesh,
-        IOobject::NO_READ,
-        IOobject::NO_WRITE
-    ),
-    mesh,
-    dimensionedScalar(phi.dimensions(), Zero)
-);
-*/
-
 #include "createMRF.H"
 #include "createFvOptions.H"
 
@@ -155,7 +138,6 @@ surfaceScalarField phi0
     phi
 );
 
-
 volVectorField U0
 (
     IOobject
@@ -169,7 +151,6 @@ volVectorField U0
     U
 );
 
-
 volScalarField alpha10
 (
     IOobject
@@ -183,5 +164,4 @@ volScalarField alpha10
     alpha1
 );
 
-
 isoAdvection advector(alpha1, phi, U);
diff --git a/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C b/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
index 024e5026339..1593cae755a 100644
--- a/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
+++ b/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
@@ -75,17 +75,13 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createDyMControls.H"
     #include "createFields.H"
-//    #include "createAlphaFluxes.H"
     #include "initCorrectPhi.H"
     #include "createUfIfPresent.H"
 
     turbulence->validate();
 
-    if (!LTS)
-    {
-        #include "CourantNo.H"
-        #include "setInitialDeltaT.H"
-    }
+    #include "CourantNo.H"
+    #include "setInitialDeltaT.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     Info<< "\nStarting time loop\n" << endl;
@@ -93,17 +89,9 @@ int main(int argc, char *argv[])
     while (runTime.run())
     {
         #include "readDyMControls.H"
-
-        if (LTS)
-        {
-            #include "setRDeltaT.H"
-        }
-        else
-        {
-            #include "CourantNo.H"
-            #include "alphaCourantNo.H"
-            #include "setDeltaT.H"
-        }
+        #include "CourantNo.H"
+        #include "alphaCourantNo.H"
+        #include "setDeltaT.H"
 
         runTime++;
 
@@ -118,12 +106,6 @@ int main(int argc, char *argv[])
 
                 if (mesh.changing())
                 {
-                    // Do not apply previous time-step mesh compression flux
-                    // if the mesh topology changed
-                    if (mesh.topoChanging())
-                    {
-//                        talphaPhi1Corr0.clear();
-                    }
 
                     gh = (g & mesh.C()) - ghRef;
                     ghf = (g & mesh.Cf()) - ghRef;
diff --git a/applications/solvers/multiphase/interIsoFoam/setRDeltaT.H b/applications/solvers/multiphase/interIsoFoam/setRDeltaT.H
deleted file mode 100644
index 26b237e7952..00000000000
--- a/applications/solvers/multiphase/interIsoFoam/setRDeltaT.H
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-    volScalarField& rDeltaT = trDeltaT.ref();
-
-    const dictionary& pimpleDict = pimple.dict();
-
-    scalar maxCo
-    (
-        pimpleDict.lookupOrDefault<scalar>("maxCo", 0.9)
-    );
-
-    scalar maxAlphaCo
-    (
-        pimpleDict.lookupOrDefault<scalar>("maxAlphaCo", 0.2)
-    );
-
-    scalar rDeltaTSmoothingCoeff
-    (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTSmoothingCoeff", 0.1)
-    );
-
-    label nAlphaSpreadIter
-    (
-        pimpleDict.lookupOrDefault<label>("nAlphaSpreadIter", 1)
-    );
-
-    scalar alphaSpreadDiff
-    (
-        pimpleDict.lookupOrDefault<scalar>("alphaSpreadDiff", 0.2)
-    );
-
-    scalar alphaSpreadMax
-    (
-        pimpleDict.lookupOrDefault<scalar>("alphaSpreadMax", 0.99)
-    );
-
-    scalar alphaSpreadMin
-    (
-        pimpleDict.lookupOrDefault<scalar>("alphaSpreadMin", 0.01)
-    );
-
-    label nAlphaSweepIter
-    (
-        pimpleDict.lookupOrDefault<label>("nAlphaSweepIter", 5)
-    );
-
-    scalar rDeltaTDampingCoeff
-    (
-        pimpleDict.lookupOrDefault<scalar>("rDeltaTDampingCoeff", 1.0)
-    );
-
-    scalar maxDeltaT
-    (
-        pimpleDict.lookupOrDefault<scalar>("maxDeltaT", GREAT)
-    );
-
-    volScalarField rDeltaT0("rDeltaT0", rDeltaT);
-
-    // Set the reciprocal time-step from the local Courant number
-    rDeltaT.ref() = max
-    (
-        1/dimensionedScalar("maxDeltaT", dimTime, maxDeltaT),
-        fvc::surfaceSum(mag(rhoPhi))()()
-       /((2*maxCo)*mesh.V()*rho())
-    );
-
-    if (maxAlphaCo < maxCo)
-    {
-        // Further limit the reciprocal time-step
-        // in the vicinity of the interface
-
-        volScalarField alpha1Bar(fvc::average(alpha1));
-
-        rDeltaT.ref() = max
-        (
-            rDeltaT(),
-            pos0(alpha1Bar() - alphaSpreadMin)
-           *pos0(alphaSpreadMax - alpha1Bar())
-           *fvc::surfaceSum(mag(phi))()()
-           /((2*maxAlphaCo)*mesh.V())
-        );
-    }
-
-    // Update tho boundary values of the reciprocal time-step
-    rDeltaT.correctBoundaryConditions();
-
-    Info<< "Flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
-
-    if (rDeltaTSmoothingCoeff < 1.0)
-    {
-        fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff);
-    }
-
-    if (nAlphaSpreadIter > 0)
-    {
-        fvc::spread
-        (
-            rDeltaT,
-            alpha1,
-            nAlphaSpreadIter,
-            alphaSpreadDiff,
-            alphaSpreadMax,
-            alphaSpreadMin
-        );
-    }
-
-    if (nAlphaSweepIter > 0)
-    {
-        fvc::sweep(rDeltaT, alpha1, nAlphaSweepIter, alphaSpreadDiff);
-    }
-
-    Info<< "Smoothed flow time scale min/max = "
-        << gMin(1/rDeltaT.primitiveField())
-        << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
-
-    // Limit rate of change of time scale
-    // - reduce as much as required
-    // - only increase at a fraction of old time scale
-    if
-    (
-        rDeltaTDampingCoeff < 1.0
-     && runTime.timeIndex() > runTime.startTimeIndex() + 1
-    )
-    {
-        rDeltaT = max
-        (
-            rDeltaT,
-            (scalar(1.0) - rDeltaTDampingCoeff)*rDeltaT0
-        );
-
-        Info<< "Damped flow time scale min/max = "
-            << gMin(1/rDeltaT.primitiveField())
-            << ", " << gMax(1/rDeltaT.primitiveField()) << endl;
-    }
-}
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
index 1d4062a9980..1bb244e84aa 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
+              Modified work | Copyright (C) 2018 Johan Roenby
 -------------------------------------------------------------------------------
 
 License
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
index 7aa04e6aec1..d12506b8f72 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoAdvection/isoAdvection.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
+              Modified work | Copyright (C) 2018 Johan Roenby
 -------------------------------------------------------------------------------
 
 License
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C
index 8e26f5c6065..0b3179edd9b 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
+              Modified work | Copyright (C) 2018 Johan Roenby
 -------------------------------------------------------------------------------
 
 License
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.H b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.H
index bc58ed71fd8..e6cbe81a9fe 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.H
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutCell/isoCutCell.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
+              Modified work | Copyright (C) 2018 Johan Roenby
 -------------------------------------------------------------------------------
 
 License
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C
index 43bc4bb6103..e0e335b55d1 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
+              Modified work | Copyright (C) 2018 Johan Roenby
 -------------------------------------------------------------------------------
 
 License
diff --git a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.H b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.H
index 46e746977f4..e1404e74415 100644
--- a/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.H
+++ b/src/finiteVolume/fvMatrices/solvers/isoAdvection/isoCutFace/isoCutFace.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                 isoAdvector | Copyright (C) 2016-2017 DHI
+              Modified work | Copyright (C) 2018 Johan Roenby
 -------------------------------------------------------------------------------
 
 License
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U
index 5ac9838bc85..a94b7efa097 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/U
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water
index 33c24db83b4..37865f4ef21 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/alpha.water
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh
index 481f0a268f9..68bb74ccfc4 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/0.orig/p_rgh
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict
index eb61c253db6..0f9623f244f 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/dynamicMeshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g
index ac04af46dd8..abc20880716 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/g
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties
index 37551da4d5b..84ac74aab24 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/transportProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties
index 8b144cad5f5..5eec0426726 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/constant/turbulenceProperties
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict
index 7cefb52001e..814938ce85d 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/blockMeshDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
index 5e9079b14ef..1ce0f5a1452 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/controlDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict
index b2a4b7e2dfb..7b18f1b23b0 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/decomposeParDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes
index f808a3220ea..b5d690a0269 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSchemes
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
index 62559f06a81..8cb6b0675d5 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/fvSolution
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict
index 7a8e532cce5..3d982f0edf5 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/setFieldsDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
index d23d2fc637f..789c09a3f42 100644
--- a/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
+++ b/tutorials/multiphase/interIsoFoam/damBreakWithObstacle/system/topoSetDict
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  5                                     |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U
index b4570e1f9b4..2ceab091b50 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/0.orig/U
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict
index 80b68543306..0d234e30500 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/dynamicMeshDict
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g
index 048d630dce2..195dbea3f3c 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/g
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties
index 53dd43b4a4d..f7055c5a380 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/transportProperties
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties
index f903d8e21ec..5eec0426726 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/constant/turbulenceProperties
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict
index b3c8c15c2b6..20064f06316 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/blockMeshDict
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict
index 522cb08b794..99bdc6404ff 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/controlDict
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict
index d8f4b26e99d..28839d76e1c 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/decomposeParDict
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes
index cd951fd6e4d..2ed4977b7df 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSchemes
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution
index 16066726eac..2a708ba9c49 100644
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/fvSolution
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
diff --git a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
index 7b5498bba04..b4a6c3060b1 100755
--- a/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
+++ b/tutorials/multiphase/interIsoFoam/discInConstantFlowCyclicBCs/system/setAlphaFieldDict
@@ -4,7 +4,8 @@
 |  \\    /   O peration     | Version:  plus                                  |
 |   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
 |    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/FoamFile
+\*---------------------------------------------------------------------------*/
+FoamFile
 {
     version     2.0;
     format      ascii;
-- 
GitLab