TUT: clean up multiphase tutorials

2025-11-28 03:28:01 +00:00 · 2020-01-29 17:19:43 +00:00
parent 647e161511
commit 01514e4d43
1349 changed files with 5623 additions and 241919 deletions
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/U
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volVectorField;
-    location    "0";
    object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,19 +24,23 @@ boundaryField
    {
        type            noSlip;
    }
+
    rightWall
    {
        type            noSlip;
    }
+
    lowerWall
    {
        type            noSlip;
    }
+
    atmosphere
    {
        type            pressureInletOutletVelocity;
        value           uniform (0 0 0);
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.air
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -35,6 +34,7 @@ boundaryField
        );
        value           uniform 0;
    }
+
    rightWall
    {
        type            alphaContactAngle;
@ -49,6 +49,7 @@ boundaryField
        );
        value           uniform 1;
    }
+
    lowerWall
    {
        type            alphaContactAngle;
@ -63,12 +64,14 @@ boundaryField
        );
        value           uniform 0;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 1;
        value           uniform 1;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.mercury
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,20 +24,24 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    rightWall
    {
        type            zeroGradient;
    }
+
    lowerWall
    {
        type            zeroGradient;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 0;
        value           uniform 0;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.oil
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,20 +24,24 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    rightWall
    {
        type            zeroGradient;
    }
+
    lowerWall
    {
        type            zeroGradient;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 0;
        value           uniform 0;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.orig/alpha.water
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,20 +24,24 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    rightWall
    {
        type            zeroGradient;
    }
+
    lowerWall
    {
        type            zeroGradient;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 0;
        value           uniform 0;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/Allrun
@ -6,7 +6,9 @@ cd "${0%/*}" || exit                                # Run from this directory
 restore0Dir

 runApplication blockMesh
+
 runApplication setFields
+
 runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/controlDict
@ -48,6 +48,7 @@ runTimeModifiable yes;
 adjustTimeStep  yes;

 maxCo           0.5;
+
 maxAlphaCo      0.5;

 maxDeltaT       1;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/decomposeParDict
@ -23,9 +23,4 @@ coeffs
    n           (2 2 1);
 }

-distributed     no;
-
-roots           ( );
-
-
 // ************************************************************************* //
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict
@ -37,6 +37,7 @@ regions
            volScalarFieldValue alpha.air 0
        );
    }
+
    boxToCell
    {
        box (0.1461 0 -1) (0.2922 0.292 1);
@ -48,6 +49,7 @@ regions
            volScalarFieldValue alpha.air 0
        );
    }
+
    boxToCell
    {
        box (0 0 -1) (0.1461 0.1 1);
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/U
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volVectorField;
-    location    "0";
    object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,19 +24,23 @@ boundaryField
    {
        type            noSlip;
    }
+
    rightWall
    {
        type            noSlip;
    }
+
    lowerWall
    {
        type            noSlip;
    }
+
    atmosphere
    {
        type            pressureInletOutletVelocity;
        value           uniform (0 0 0);
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.air
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -35,6 +34,7 @@ boundaryField
        );
        value           uniform 0;
    }
+
    rightWall
    {
        type            alphaContactAngle;
@ -49,6 +49,7 @@ boundaryField
        );
        value           uniform 1;
    }
+
    lowerWall
    {
        type            alphaContactAngle;
@ -63,12 +64,14 @@ boundaryField
        );
        value           uniform 0;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 1;
        value           uniform 1;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.mercury
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,20 +24,24 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    rightWall
    {
        type            zeroGradient;
    }
+
    lowerWall
    {
        type            zeroGradient;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 0;
        value           uniform 0;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.oil
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,20 +24,24 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    rightWall
    {
        type            zeroGradient;
    }
+
    lowerWall
    {
        type            zeroGradient;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 0;
        value           uniform 0;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alpha.water
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,20 +24,24 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    rightWall
    {
        type            zeroGradient;
    }
+
    lowerWall
    {
        type            zeroGradient;
    }
+
    atmosphere
    {
        type            inletOutlet;
        inletValue      uniform 0;
        value           uniform 0;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.orig/alphas
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    location    "0";
    object      alphas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,18 +24,22 @@ boundaryField
    {
        type            zeroGradient;
    }
+
    rightWall
    {
        type            zeroGradient;
    }
+
    lowerWall
    {
        type            zeroGradient;
    }
+
    atmosphere
    {
        type            zeroGradient;
    }
+
    defaultFaces
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/Allrun
@ -6,9 +6,13 @@ cd "${0%/*}" || exit                                # Run from this directory
 restore0Dir

 runApplication blockMesh
+
 runApplication setFields
+
 runApplication decomposePar
+
 runParallel $(getApplication)
+
 runApplication reconstructPar

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/controlDict
@ -48,6 +48,7 @@ runTimeModifiable yes;
 adjustTimeStep  yes;

 maxCo           0.5;
+
 maxAlphaCo      0.5;

 maxDeltaT       1;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/decomposeParDict
@ -23,9 +23,4 @@ coeffs
    n           (2 2 1);
 }

-distributed     no;
-
-roots           ( );
-
-
 // ************************************************************************* //
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict
@ -37,6 +37,7 @@ regions
            volScalarFieldValue alpha.air 0
        );
    }
+
    boxToCell
    {
        box (0.1461 0 -1) (0.2922 0.292 1);
@ -48,6 +49,7 @@ regions
            volScalarFieldValue alpha.air 0
        );
    }
+
    boxToCell
    {
        box (0 0 -1) (0.1461 0.1 1);
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/0.orig/U
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volVectorField;
-    location    "0";
    object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -25,14 +24,17 @@ boundaryField
    {
        type            noSlip;
    }
+
    stator
    {
        type            noSlip;
    }
+
    front
    {
        type            empty;
    }
+
    back
    {
        type            empty;
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun
@ -3,11 +3,12 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------

-runApplication ./makeMesh
+./Allrun.pre
+
 restore0Dir
-topoSet
-setFields
-setsToZones -noFlipMap
+
+runApplication setFields
+
 runApplication $(getApplication)

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/Allrun.pre
@ -1,11 +1,14 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
+. ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------

 m4 system/blockMeshDict.m4 > system/blockMeshDict
-blockMesh

-topoSet
-setsToZones -noFlipMap
+runApplication blockMesh
+
+runApplication topoSet
+
+runApplication setsToZones -noFlipMap

 #------------------------------------------------------------------------------
--- a/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/laminar/mixerVessel2D/system/controlDict
@ -48,28 +48,27 @@ runTimeModifiable yes;
 adjustTimeStep  yes;

 maxCo           0.5;
+
 maxAlphaCo      0.5;

 maxDeltaT       1;

+
 functions
 {
    sTransport
    {
        type            energyTransport;
        libs            (solverFunctionObjects);
-
        enabled         true;
        writeControl    outputTime;
        writeInterval   1;
+        write           true;

        field           T;
-
        rho             rho;
        phi             rhoPhi;

-        write           true;
-
        phaseThermos
        {
            alpha.air