multiphase: completed renaming of phase fields to use the new groupName convention and interface

applications/solvers/multiphase/multiphaseEulerFoam/Allwclean

@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wclean libso phaseModel
 wclean libso multiphaseSystem
 wclean libso interfacialModels
 wclean

applications/solvers/multiphase/multiphaseEulerFoam/Allwmake

@@ -2,9 +2,9 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso phaseModel
+wmakeLnInclude interfacialModels
-wmake libso interfacialModels
 wmake libso multiphaseSystem
+wmake libso interfacialModels
 wmake
 
 # ----------------------------------------------------------------- end-of-file

applications/solvers/multiphase/multiphaseEulerFoam/Make/options

@@ -1,5 +1,4 @@
 EXE_INC = \
-    -IphaseModel/lnInclude \
     -ImultiphaseSystem/lnInclude \
     -ImultiphaseFixedFluxPressure \
     -IinterfacialModels/lnInclude \
@@ -15,7 +14,6 @@ EXE_INC = \
 
 EXE_LIBS = \
     -lmultiphaseSystem \
-    -lcompressibleMultiPhaseModel \
     -linterfaceProperties \
     -lincompressibleTransportModels \
     -lcompressibleMultiphaseEulerianInterfacialModels \

applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/Make/options

@@ -1,6 +1,6 @@
 EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I../multiphaseSystem/lnInclude \
-    -I../phaseModel/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
-    -lcompressibleMultiPhaseModel
+    -lmultiphaseSystem

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/files

@@ -1,3 +1,9 @@
+phaseModel/phaseModel.C
+diameterModels/diameterModel/diameterModel.C
+diameterModels/diameterModel/newDiameterModel.C
+diameterModels/constantDiameter/constantDiameter.C
+diameterModels/isothermalDiameter/isothermalDiameter.C
+
 alphaContactAngle/alphaContactAngleFvPatchScalarField.C
 multiphaseSystem.C
 

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/Make/options

@@ -8,7 +8,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
-    -lcompressibleMultiPhaseModel \
     -linterfaceProperties \
     -lincompressibleTransportModels \
     -lcompressibleMultiphaseEulerianInterfacialModels \

applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C

@@ -34,7 +34,7 @@ License
 
 Foam::phaseModel::phaseModel
 (
-    const word& name,
+    const word& phaseName,
     const dictionary& phaseDict,
     const fvMesh& mesh
 )
@@ -43,7 +43,7 @@ Foam::phaseModel::phaseModel
     (
         IOobject
         (
-            "alpha" + name,
+            IOobject::groupName("alpha", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -51,7 +51,7 @@ Foam::phaseModel::phaseModel
         ),
         mesh
     ),
-    name_(name),
+    name_(phaseName),
     phaseDict_(phaseDict),
     nu_
     (
@@ -81,7 +81,7 @@ Foam::phaseModel::phaseModel
     (
         IOobject
         (
-            "U" + name,
+            IOobject::groupName("U", phaseName),
             mesh.time().timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -93,7 +93,7 @@ Foam::phaseModel::phaseModel
     (
         IOobject
         (
-            "DDtU" + name,
+            IOobject::groupName("DDtU", phaseName),
             mesh.time().timeName(),
             mesh
         ),
@@ -104,7 +104,7 @@ Foam::phaseModel::phaseModel
     (
         IOobject
         (
-            "phiAlpha" + name,
+            IOobject::groupName("phiAlpha", phaseName),
             mesh.time().timeName(),
             mesh
         ),
@@ -112,7 +112,7 @@ Foam::phaseModel::phaseModel
         dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
     )
 {
-    const word phiName = "phi" + name;
+    const word phiName = IOobject::groupName("phi", name_);
 
     IOobject phiHeader
     (

applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/files

@@ -1,7 +0,0 @@
-phaseModel/phaseModel.C
-diameterModels/diameterModel/diameterModel.C
-diameterModels/diameterModel/newDiameterModel.C
-diameterModels/constantDiameter/constantDiameter.C
-diameterModels/isothermalDiameter/isothermalDiameter.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleMultiPhaseModel

applications/solvers/multiphase/multiphaseEulerFoam/phaseModel/Make/options

@@ -1,6 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/transportModels/incompressible/lnInclude
-
-LIB_LIBS = \
-    -lincompressibleTransportModels

applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C

@@ -29,7 +29,7 @@ License
 
 Foam::phase::phase
 (
-    const word& name,
+    const word& phaseName,
     const dictionary& phaseDict,
     const volVectorField& U,
     const surfaceScalarField& phi
@@ -39,7 +39,7 @@ Foam::phase::phase
     (
         IOobject
         (
-            "alpha" + name,
+            IOobject::groupName("alpha", phaseName),
             U.mesh().time().timeName(),
             U.mesh(),
             IOobject::MUST_READ,
@@ -47,9 +47,18 @@ Foam::phase::phase
         ),
         U.mesh()
     ),
-    name_(name),
+    name_(phaseName),
     phaseDict_(phaseDict),
-    nuModel_(viscosityModel::New("nu" + name, phaseDict_, U, phi)),
+    nuModel_
+    (
+        viscosityModel::New
+        (
+            IOobject::groupName("nu", phaseName),
+            phaseDict_,
+            U,
+            phi
+        )
+    ),
     rho_(phaseDict_.lookup("rho"))
 {}
 

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/U

@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "constant";
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    atmosphere
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+    walls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water

@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "constant";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/alpha.water.org

@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "constant";
+    object      alpha.water.org;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/p_rgh

@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "constant";
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    atmosphere
+    {
+        type            totalPressure;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        p0              uniform 0;
+        value           uniform 0;
+    }
+    walls
+    {
+        type            fixedFluxPressure;
+        gradient        uniform 0;
+        phi             phiAbs;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.air

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Tair;
+    object      T.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -27,7 +27,7 @@ boundaryField
     outlet
     {
         type               inletOutlet;
-        phi                phiair;
+        phi                phi.air;
         inletValue         $internalField;
         value              $internalField;
     }

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/T.water

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      Twater;
+    object      T.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -27,7 +27,7 @@ boundaryField
     outlet
     {
         type               inletOutlet;
-        phi                phiwater;
+        phi                phi.water;
         inletValue         uniform 300;
         value              $internalField;
     }

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.air

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      binary;
     class       volVectorField;
-    object      Uair;
+    object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -28,7 +28,7 @@ boundaryField
     outlet
     {
         type               pressureInletOutletVelocity;
-        phi                phiair;
+        phi                phi.air;
         value              $internalField;
     }
     walls

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/U.water

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      binary;
     class       volVectorField;
-    object      Uwater;
+    object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -28,7 +28,7 @@ boundaryField
     outlet
     {
         type               pressureInletOutletVelocity;
-        phi                phiwater;
+        phi                phi.water;
         value              $internalField;
     }
     walls

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaair;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -1908,7 +1908,7 @@ boundaryField
     outlet
     {
         type            inletOutlet;
-        phi             phiair;
+        phi             phi.air;
         inletValue      uniform 1;
         value           uniform 1;
     }

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.air.org

@@ -28,7 +28,7 @@ boundaryField
     outlet
     {
         type            inletOutlet;
-        phi             phiair;
+        phi             phi.air;
         inletValue      uniform 1;
         value           uniform 1;
     }

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -1908,7 +1908,7 @@ boundaryField
     outlet
     {
         type            inletOutlet;
-        phi             phiwater;
+        phi             phi.water;
         inletValue      uniform 0;
         value           uniform 0;
     }

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alpha.water.org

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -28,7 +28,7 @@ boundaryField
     outlet
     {
         type            inletOutlet;
-        phi             phiwater;
+        phi             phi.water;
         inletValue      uniform 0;
         value           uniform 0;
     }

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/constant/polyMesh/boundary

@@ -38,6 +38,7 @@ FoamFile
     defaultFaces
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          3750;
         startFace       3850;
     }

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/controlDict

@@ -60,21 +60,21 @@ functions
         outputControl   outputTime;
         fields
         (
-            Uair
+            U.air
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            Uwater
+            U.water
             {
                  mean        on;
                  prime2Mean  off;
                  base        time;
             }
 
-            alphaair
+            alpha.air
             {
                  mean        on;
                  prime2Mean  off;

tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/setFieldsDict

@@ -17,8 +17,8 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphaair 1
+    volScalarFieldValue alpha.air 1
-    volScalarFieldValue alphawater 0
+    volScalarFieldValue alpha.water 0
 );
 
 regions
@@ -28,8 +28,8 @@ regions
         box (0 0 -0.1) (0.15 0.701 0.1);
         fieldValues
         (
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
-            volScalarFieldValue alphawater 1
+            volScalarFieldValue alpha.water 1
         );
     }
 );

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.air

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volVectorField;
     location    "0";
-    object      Uoil;
+    object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.mercury

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volVectorField;
     location    "0";
-    object      Umercury;
+    object      U.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/U.oil

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volVectorField;
     location    "0";
-    object      Uair;
+    object      U.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.air

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaair;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.mercury

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphamercury;
+    object      alpha.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.oil

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaoil;
+    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/alpha.water

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p

@@ -42,8 +42,8 @@ boundaryField
     {
         type            totalPressure;
         p0              uniform 0;
-        U               Uair;
+        U               U.air;
-        phi             phiair;
+        phi             phi.air;
         rho             rho;
         psi             none;
         gamma           1;

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/constant/polyMesh/boundary

@@ -44,6 +44,7 @@ FoamFile
     defaultFaces
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          4536;
         startFace       4640;
     }

tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/setFieldsDict

@@ -17,10 +17,10 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphaair 1
+    volScalarFieldValue alpha.air 1
-    volScalarFieldValue alphawater 0
+    volScalarFieldValue alpha.water 0
-    volScalarFieldValue alphaoil 0
+    volScalarFieldValue alpha.oil 0
-    volScalarFieldValue alphamercury 0
+    volScalarFieldValue alpha.mercury 0
     volVectorFieldValue U ( 0 0 0 )
 );
 
@@ -31,10 +31,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 1
+            volScalarFieldValue alpha.water 1
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -42,10 +42,10 @@ regions
         box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 1
+            volScalarFieldValue alpha.oil 1
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -53,10 +53,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.1 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 1
+            volScalarFieldValue alpha.mercury 1
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
 );

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.air

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volVectorField;
     location    "0";
-    object      Uair;
+    object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.mercury

@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    location    "0";
+    object      U.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (0 0 0);
+
+boundaryField
+{
+    leftWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    rightWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    lowerWall
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    atmosphere
+    {
+        type            fluxCorrectedVelocity;
+        value           uniform (0 0 0);
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/U.oil

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volVectorField;
     location    "0";
-    object      Uoil;
+    object      U.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/Umercury

@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    location    "0";
-    object      Umercury;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    leftWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    rightWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-    atmosphere
-    {
-        type            fluxCorrectedVelocity;
-        value           uniform (0 0 0);
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.air

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaair;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.mercury

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphamercury;
+    object      alpha.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.oil

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaoil;
+    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/alpha.water

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/0.org/p

@@ -42,8 +42,8 @@ boundaryField
     {
         type            totalPressure;
         p0              uniform 0;
-        U               Uair;
+        U               U.air;
-        phi             phiair;
+        phi             phi.air;
         rho             rho;
         psi             none;
         gamma           1;

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/constant/polyMesh/boundary

@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+5
+(
+    leftWall
+    {
+        type            wall;
+        nFaces          195;
+        startFace       68014;
+    }
+    rightWall
+    {
+        type            wall;
+        nFaces          195;
+        startFace       68209;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          206;
+        startFace       68404;
+    }
+    atmosphere
+    {
+        type            patch;
+        nFaces          176;
+        startFace       68610;
+    }
+    defaultFaces
+    {
+        type            empty;
+        inGroups        1(empty);
+        nFaces          68400;
+        startFace       68786;
+    }
+)
+
+// ************************************************************************* //

tutorials/multiphase/multiphaseEulerFoam/damBreak4phaseFine/system/setFieldsDict

@@ -17,10 +17,10 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphaair 1
+    volScalarFieldValue alpha.air 1
-    volScalarFieldValue alphawater 0
+    volScalarFieldValue alpha.water 0
-    volScalarFieldValue alphaoil 0
+    volScalarFieldValue alpha.oil 0
-    volScalarFieldValue alphamercury 0
+    volScalarFieldValue alpha.mercury 0
     volVectorFieldValue U ( 0 0 0 )
 );
 
@@ -31,10 +31,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 1
+            volScalarFieldValue alpha.water 1
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -42,10 +42,10 @@ regions
         box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 1
+            volScalarFieldValue alpha.oil 1
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -53,10 +53,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.1 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 1
+            volScalarFieldValue alpha.mercury 1
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
 );

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.air

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Uair;
+    object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.mercury

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Umercury;
+    object      U.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.oil

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Uoil;
+    object      U.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/U.water

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    object      Uwater;
+    object      U.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.air

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphaoil;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.mercury

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphamercury;
+    object      alpha.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.oil

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphaair;
+    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/0/alpha.water

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseEulerFoam/mixerVessel2D/constant/polyMesh/boundary

@@ -32,12 +32,14 @@ FoamFile
     front
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          3072;
         startFace       6336;
     }
     back
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          3072;
         startFace       9408;
     }

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.air

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaair;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.mercury

@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alpha.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.oil

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaoil;
+    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alpha.water

@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphamercury

@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      alphamercury;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0.org/alphawater

@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      alphawater;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary

@@ -44,6 +44,7 @@ FoamFile
     defaultFaces
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          4536;
         startFace       4640;
     }

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/setFieldsDict

@@ -17,10 +17,10 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphaair 1
+    volScalarFieldValue alpha.air 1
-    volScalarFieldValue alphawater 0
+    volScalarFieldValue alpha.water 0
-    volScalarFieldValue alphaoil 0
+    volScalarFieldValue alpha.oil 0
-    volScalarFieldValue alphamercury 0
+    volScalarFieldValue alpha.mercury 0
     volVectorFieldValue U ( 0 0 0 )
 );
 
@@ -31,10 +31,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 1
+            volScalarFieldValue alpha.water 1
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -42,10 +42,10 @@ regions
         box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 1
+            volScalarFieldValue alpha.oil 1
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -53,10 +53,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.1 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 1
+            volScalarFieldValue alpha.mercury 1
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
 );

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.air

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaair;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.mercury

@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alpha.mercury;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.oil

@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaoil;
+    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alpha.water

@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      alpha.water;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    leftWall
+    {
+        type            zeroGradient;
+    }
+    rightWall
+    {
+        type            zeroGradient;
+    }
+    lowerWall
+    {
+        type            zeroGradient;
+    }
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    defaultFaces
+    {
+        type            empty;
+    }
+}
+
+
+// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphamercury

@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      alphamercury;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0.org/alphawater

@@ -1,49 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      alphawater;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    leftWall
-    {
-        type            zeroGradient;
-    }
-    rightWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    atmosphere
-    {
-        type            inletOutlet;
-        inletValue      uniform 0;
-        value           uniform 0;
-    }
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/constant/polyMesh/boundary

@@ -44,6 +44,7 @@ FoamFile
     defaultFaces
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          68400;
         startFace       68786;
     }

tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/setFieldsDict

@@ -17,10 +17,11 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphaair 1
+    volScalarFieldValue alpha.air 1
-    volScalarFieldValue alphawater 0
+    volScalarFieldValue alpha.water 0
-    volScalarFieldValue alphaoil 0
+    volScalarFieldValue alpha.oil 0
-    volScalarFieldValue alphamercury 0
+    volScalarFieldValue alpha.mercury 0
+    volVectorFieldValue U ( 0 0 0 )
 );
 
 regions
@@ -30,10 +31,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 1
+            volScalarFieldValue alpha.water 1
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -41,10 +42,10 @@ regions
         box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 1
+            volScalarFieldValue alpha.oil 1
-            volScalarFieldValue alphamercury 0
+            volScalarFieldValue alpha.mercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -52,10 +53,10 @@ regions
         box ( 0 0 -1 ) ( 0.1461 0.1 1 );
         fieldValues
         (
-            volScalarFieldValue alphawater 0
+            volScalarFieldValue alpha.water 0
-            volScalarFieldValue alphaoil 0
+            volScalarFieldValue alpha.oil 0
-            volScalarFieldValue alphamercury 1
+            volScalarFieldValue alpha.mercury 1
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.air 0
         );
     }
 );