From acf490cb443e26f6658ef224d4096f7e71ade374 Mon Sep 17 00:00:00 2001
From: william <william>
Date: Thu, 23 Jan 2014 11:27:37 +0000
Subject: [PATCH] STYLE: twoPhaseEulerFoam: updated tutorials for bubble
 library developments

---
 .../LES/bubbleColumn/constant/phaseProperties | 175 +++++++++++++++---
 .../RAS/bubbleColumn/constant/phaseProperties | 175 +++++++++++++++---
 .../RAS/fluidisedBed/constant/phaseProperties | 152 +++++++++++++--
 .../constant/turbulenceProperties.particles   |   1 +
 .../bubbleColumn/constant/phaseProperties     | 174 ++++++++++++++---
 .../bubbleColumnIATE/constant/phaseProperties | 175 +++++++++++++++---
 .../fluidisedBed/constant/phaseProperties     | 152 +++++++++++++--
 .../mixerVessel2D/constant/phaseProperties    | 173 +++++++++++++++--
 8 files changed, 1029 insertions(+), 148 deletions(-)

diff --git a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
index 443b39213e5..09b1c3f2420 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/LES/bubbleColumn/constant/phaseProperties
@@ -36,47 +36,176 @@ water
     }
 }
 
-// Surface tension coefficient
-sigma           0.07;
-
-drag
+blending
 {
-    air     SchillerNaumann;
-    water   SchillerNaumann;
+    default
+    {
+        type            linear;
+        residualAlpha   1e-6;
+        maxFullyDispersedAlpha.air 0.3;
+        maxPartlyDispersedAlpha.air 0.5;
+        maxFullyDispersedAlpha.water 0.3;
+        maxPartlyDispersedAlpha.water 0.5;
+    }
 }
 
-heatTransfer
-{
-    air     RanzMarshall;
-    water   RanzMarshall;
-}
+sigma
+(
+    (air and water)     0.07
+);
+
+aspectRatio
+(
+    (air in water)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (water in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (air in water)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in air)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and water)
+    {
+        type            segregated;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
 
 lift
-{
-    air
+(
+    (air in water)
     {
         type            none;
     }
-    water
+
+    (water in air)
+    {
+        type            none;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+heatTransfer
+(
+    (air in water)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (water in air)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+virtualMass
+(
+    (air in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (water in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+wallLubrication
+(
+    (air in water)
     {
         type            none;
     }
-}
 
-dispersedPhase          both;
+    (water in air)
+    {
+        type            none;
+    }
 
-residualPhaseFraction   1e-3;
-residualSlip            1e-2;
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+turbulentDispersion
+(
+    (air in water)
+    {
+        type            none;
+    }
 
-// Virtual-mass coefficient
-Cvm             0.5;
+    (water in air)
+    {
+        type            none;
+    }
 
-// Dispersed-phase turbulence coefficient
-Ct              1;
+    (air and water)
+    {
+        type            none;
+    }
+);
 
 // Minimum allowable pressure
 pMin            10000;
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
index 443b39213e5..09b1c3f2420 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/bubbleColumn/constant/phaseProperties
@@ -36,47 +36,176 @@ water
     }
 }
 
-// Surface tension coefficient
-sigma           0.07;
-
-drag
+blending
 {
-    air     SchillerNaumann;
-    water   SchillerNaumann;
+    default
+    {
+        type            linear;
+        residualAlpha   1e-6;
+        maxFullyDispersedAlpha.air 0.3;
+        maxPartlyDispersedAlpha.air 0.5;
+        maxFullyDispersedAlpha.water 0.3;
+        maxPartlyDispersedAlpha.water 0.5;
+    }
 }
 
-heatTransfer
-{
-    air     RanzMarshall;
-    water   RanzMarshall;
-}
+sigma
+(
+    (air and water)     0.07
+);
+
+aspectRatio
+(
+    (air in water)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (water in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (air in water)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in air)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and water)
+    {
+        type            segregated;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
 
 lift
-{
-    air
+(
+    (air in water)
     {
         type            none;
     }
-    water
+
+    (water in air)
+    {
+        type            none;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+heatTransfer
+(
+    (air in water)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (water in air)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+virtualMass
+(
+    (air in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (water in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+wallLubrication
+(
+    (air in water)
     {
         type            none;
     }
-}
 
-dispersedPhase          both;
+    (water in air)
+    {
+        type            none;
+    }
 
-residualPhaseFraction   1e-3;
-residualSlip            1e-2;
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+turbulentDispersion
+(
+    (air in water)
+    {
+        type            none;
+    }
 
-// Virtual-mass coefficient
-Cvm             0.5;
+    (water in air)
+    {
+        type            none;
+    }
 
-// Dispersed-phase turbulence coefficient
-Ct              1;
+    (air and water)
+    {
+        type            none;
+    }
+);
 
 // Minimum allowable pressure
 pMin            10000;
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
index c04f267f53a..7dedb2618a6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/phaseProperties
@@ -35,40 +35,152 @@ air
     }
 }
 
-// Surface tension coefficient
-sigma           0;
-
-drag
+blending
 {
-    particles   GidaspowErgunWenYu;
-    air         GidaspowErgunWenYu;
+    default
+    {
+        type            none;
+        residualAlpha   1e-6;
+        continuousPhase air;
+    }
 }
 
-heatTransfer
-{
-    particles   RanzMarshall;
-    air         RanzMarshall;
-}
+sigma
+(
+    (particles and air) 0
+);
+
+aspectRatio
+(
+    (particles in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (air in particles)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (particles in air)
+    {
+        type            GidaspowErgunWenYu;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
 
 lift
-{
-    particles
+(
+    (particles in air)
     {
         type            none;
     }
-    air
+
+    (air in particles)
     {
         type            none;
     }
-}
 
-dispersedPhase     particles;
+    (particles and air)
+    {
+        type            none;
+    }
+);
 
-residualPhaseFraction   1e-3;
-residualSlip            1e-2;
+heatTransfer
+(
+    (particles in air)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
 
-// Virtual-mass coefficient
-Cvm             0;
+    (particles and air)
+    {
+        type            none;
+    }
+);
+
+virtualMass
+(
+    (particles in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
+
+wallLubrication
+(
+    (particles in air)
+    {
+        type            none;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
+
+turbulentDispersion
+(
+    (particles in air)
+    {
+        type            none;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
 
 // Minimum allowable pressure
 pMin            10000;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
index 6a6c9f15c02..8042c591d13 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/RAS/fluidisedBed/constant/turbulenceProperties.particles
@@ -31,6 +31,7 @@ RAS
         e                       0.8;
         alphaMax                0.62;
         alphaMinFriction        0.5;
+        residualAlpha           1e-6;
 
         viscosityModel          Gidaspow;
         conductivityModel       Gidaspow;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
index 0da3a3d89bf..09b1c3f2420 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@@ -36,44 +36,176 @@ water
     }
 }
 
-// Surface tension coefficient
-sigma           0.07;
-
-drag
+blending
 {
-    air     SchillerNaumann;
-    water   SchillerNaumann;
+    default
+    {
+        type            linear;
+        residualAlpha   1e-6;
+        maxFullyDispersedAlpha.air 0.3;
+        maxPartlyDispersedAlpha.air 0.5;
+        maxFullyDispersedAlpha.water 0.3;
+        maxPartlyDispersedAlpha.water 0.5;
+    }
 }
 
-heatTransfer
-{
-    air     RanzMarshall;
-    water   RanzMarshall;
-}
+sigma
+(
+    (air and water)     0.07
+);
+
+aspectRatio
+(
+    (air in water)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (water in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (air in water)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in air)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and water)
+    {
+        type            segregated;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
 
 lift
-{
-    air
+(
+    (air in water)
     {
         type            none;
     }
-    water
+
+    (water in air)
     {
         type            none;
     }
-}
 
-dispersedPhase          both;
+    (air and water)
+    {
+        type            none;
+    }
+);
 
-residualPhaseFraction   1e-3;
-residualSlip            1e-2;
+heatTransfer
+(
+    (air in water)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
 
-// Virtual-mass ceofficient
-Cvm             0.5;
+    (water in air)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+virtualMass
+(
+    (air in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (water in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+wallLubrication
+(
+    (air in water)
+    {
+        type            none;
+    }
+
+    (water in air)
+    {
+        type            none;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+turbulentDispersion
+(
+    (air in water)
+    {
+        type            none;
+    }
+
+    (water in air)
+    {
+        type            none;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
 
 // Minimum allowable pressure
 pMin            10000;
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
index d87591c22cc..3df47589008 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@@ -25,6 +25,7 @@ air
     {
         dMax 1e-2;
         dMin 1e-4;
+        residualAlpha 1e-6;
 
         sources
         (
@@ -56,44 +57,176 @@ water
     }
 }
 
-// Surface tension coefficient
-sigma           0.07;
-
-drag
+blending
 {
-    air     SchillerNaumann;
-    water   SchillerNaumann;
+    default
+    {
+        type            linear;
+        residualAlpha   1e-6;
+        maxFullyDispersedAlpha.air 0.3;
+        maxPartlyDispersedAlpha.air 0.5;
+        maxFullyDispersedAlpha.water 0.3;
+        maxPartlyDispersedAlpha.water 0.5;
+    }
 }
 
-heatTransfer
-{
-    air     RanzMarshall;
-    water   RanzMarshall;
-}
+sigma
+(
+    (air and water)     0.07
+);
+
+aspectRatio
+(
+    (air in water)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (water in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (air in water)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in air)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and water)
+    {
+        type            segregated;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
 
 lift
-{
-    air
+(
+    (air in water)
     {
         type            none;
     }
-    water
+
+    (water in air)
     {
         type            none;
     }
-}
 
-dispersedPhase          both;
+    (air and water)
+    {
+        type            none;
+    }
+);
 
-residualPhaseFraction   1e-3;
-residualSlip            1e-2;
+heatTransfer
+(
+    (air in water)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
 
-// Virtual-mass ceofficient
-Cvm             0.5;
+    (water in air)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+virtualMass
+(
+    (air in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (water in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+wallLubrication
+(
+    (air in water)
+    {
+        type            none;
+    }
+
+    (water in air)
+    {
+        type            none;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+turbulentDispersion
+(
+    (air in water)
+    {
+        type            none;
+    }
+
+    (water in air)
+    {
+        type            none;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
 
 // Minimum allowable pressure
 pMin            10000;
 
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
index 15f85c3e98f..7dedb2618a6 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@@ -35,40 +35,152 @@ air
     }
 }
 
-// Surface tension coefficient
-sigma           0;
-
-drag
+blending
 {
-    particles   GidaspowErgunWenYu;
-    air         GidaspowErgunWenYu;
+    default
+    {
+        type            none;
+        residualAlpha   1e-6;
+        continuousPhase air;
+    }
 }
 
-heatTransfer
-{
-    particles   RanzMarshall;
-    air         RanzMarshall;
-}
+sigma
+(
+    (particles and air) 0
+);
+
+aspectRatio
+(
+    (particles in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (air in particles)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (particles in air)
+    {
+        type            GidaspowErgunWenYu;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
 
 lift
-{
-    particles
+(
+    (particles in air)
     {
         type            none;
     }
-    air
+
+    (air in particles)
     {
         type            none;
     }
-}
 
-dispersedPhase     particles;
+    (particles and air)
+    {
+        type            none;
+    }
+);
 
-residualPhaseFraction   1e-3;
-residualSlip            1e-2;
+heatTransfer
+(
+    (particles in air)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
 
-// Virtual-mass ceofficient
-Cvm             0;
+    (particles and air)
+    {
+        type            none;
+    }
+);
+
+virtualMass
+(
+    (particles in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
+
+wallLubrication
+(
+    (particles in air)
+    {
+        type            none;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
+
+turbulentDispersion
+(
+    (particles in air)
+    {
+        type            none;
+    }
+
+    (air in particles)
+    {
+        type            none;
+    }
+
+    (particles and air)
+    {
+        type            none;
+    }
+);
 
 // Minimum allowable pressure
 pMin            10000;
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
index 8ec38de9ea6..09b1c3f2420 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@@ -36,40 +36,173 @@ water
     }
 }
 
-// Surface tension coefficient
-sigma           0.07;
-
-drag
+blending
 {
-    air     SchillerNaumann;
-    water   SchillerNaumann;
+    default
+    {
+        type            linear;
+        residualAlpha   1e-6;
+        maxFullyDispersedAlpha.air 0.3;
+        maxPartlyDispersedAlpha.air 0.5;
+        maxFullyDispersedAlpha.water 0.3;
+        maxPartlyDispersedAlpha.water 0.5;
+    }
 }
 
-heatTransfer
-{
-    air     RanzMarshall;
-    water   RanzMarshall;
-}
+sigma
+(
+    (air and water)     0.07
+);
+
+aspectRatio
+(
+    (air in water)
+    {
+        type            constant;
+        E0              1.0;
+    }
+
+    (water in air)
+    {
+        type            constant;
+        E0              1.0;
+    }
+);
+
+drag
+(
+    (air in water)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (water in air)
+    {
+        type            SchillerNaumann;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+
+    (air and water)
+    {
+        type            segregated;
+        residualAlpha   1e-6;
+        residualSlip    1e-3;
+        residualRe      1e-3;
+        m               0.5;
+        n               8;
+        swarmCorrection
+        {
+            type        none;
+        }
+    }
+);
 
 lift
-{
-    air
+(
+    (air in water)
     {
         type            none;
     }
-    water
+
+    (water in air)
     {
         type            none;
     }
-}
 
-dispersedPhase          both;
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+heatTransfer
+(
+    (air in water)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (water in air)
+    {
+        type            RanzMarshall;
+        residualRe      1e-3;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+virtualMass
+(
+    (air in water)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (water in air)
+    {
+        type            constantCoefficient;
+        Cvm             0.5;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+wallLubrication
+(
+    (air in water)
+    {
+        type            none;
+    }
+
+    (water in air)
+    {
+        type            none;
+    }
+
+    (air and water)
+    {
+        type            none;
+    }
+);
+
+turbulentDispersion
+(
+    (air in water)
+    {
+        type            none;
+    }
 
-residualPhaseFraction   1e-3;
-residualSlip            1e-2;
+    (water in air)
+    {
+        type            none;
+    }
 
-// Virtual-mass coefficient
-Cvm             0.5;
+    (air and water)
+    {
+        type            none;
+    }
+);
 
 // Minimum allowable pressure
 pMin            10000;
-- 
GitLab