From 203c79307151f85376a912c7566ad8b89b74d4f0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 2 Sep 2013 14:25:44 +0100
Subject: [PATCH] tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D:
 Updated for new phase naming

---
 .../0.org/{alphamercury => alpha.air}         |  2 +-
 .../0.org/{alphas => alpha.mercury}           |  2 +-
 .../0.org/{alphaoil => alpha.oil}             |  2 +-
 .../0.org/{alphaair => alpha.water}           |  0
 .../mixerVessel2D/0.org/alphawater            | 44 -------------------
 .../mixerVessel2D/0/{alphaair => alpha.air}   |  2 +-
 .../0/{alphamercury => alpha.mercury}         |  2 +-
 .../mixerVessel2D/0/{alphaoil => alpha.oil}   |  2 +-
 .../0/{alphawater => alpha.water}             |  2 +-
 .../mixerVessel2D/constant/polyMesh/boundary  |  2 +
 .../constant/transportProperties              |  2 -
 .../mixerVessel2D/system/setFieldsDict        | 32 +++++++-------
 12 files changed, 25 insertions(+), 69 deletions(-)
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/{alphamercury => alpha.air} (97%)
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/{alphas => alpha.mercury} (97%)
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/{alphaoil => alpha.oil} (97%)
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/{alphaair => alpha.water} (100%)
 delete mode 100644 tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphawater
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/{alphaair => alpha.air} (99%)
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/{alphamercury => alpha.mercury} (99%)
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/{alphaoil => alpha.oil} (99%)
 rename tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/{alphawater => alpha.water} (99%)

diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphamercury b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.air
similarity index 97%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphamercury
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.air
index 0f3dcd4639..210222182a 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphamercury
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.air
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphas b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.mercury
similarity index 97%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphas
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.mercury
index 0f3dcd4639..cbb4647b47 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphas
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.mercury
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphaoil b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.oil
similarity index 97%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphaoil
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.oil
index 0f3dcd4639..e8b4d42497 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphaoil
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.oil
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha1;
+    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphaair b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water
similarity index 100%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphaair
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphawater b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphawater
deleted file mode 100644
index 0f3dcd4639..0000000000
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alphawater
+++ /dev/null
@@ -1,44 +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;
-    object      alpha1;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    rotor
-    {
-        type            zeroGradient;
-    }
-
-    stator
-    {
-        type            zeroGradient;
-    }
-
-    front
-    {
-        type            empty;
-    }
-
-    back
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphaair b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.air
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphaair
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.air
index b25f228620..a53034d33d 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphaair
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.air
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaair;
+    object      alpha.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphamercury b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.mercury
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphamercury
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.mercury
index 0e6d124fd0..76002901ed 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphamercury
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.mercury
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphamercury;
+    object      alpha.mercury;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphaoil b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.oil
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphaoil
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.oil
index 2311855110..56d642d0d9 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphaoil
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.oil
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphaoil;
+    object      alpha.oil;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphawater b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.water
similarity index 99%
rename from tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphawater
rename to tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.water
index d61eb80ddf..766d8c1462 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alphawater
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0/alpha.water
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      alphawater;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/boundary
index 292f25b806..188a0f0c58 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/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;
     }
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/transportProperties b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/transportProperties
index e338328156..3cfdbabfaf 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/transportProperties
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/constant/transportProperties
@@ -46,8 +46,6 @@ phases
      }
 );
 
-refPhase        air;
-
 sigmas
 (
     (air water) 0.07
diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/setFieldsDict b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/setFieldsDict
index d5dd8aca43..82d9ffc783 100644
--- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/setFieldsDict
+++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/system/setFieldsDict
@@ -17,10 +17,10 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alphaair 1
-    volScalarFieldValue alphawater 0
-    volScalarFieldValue alphaoil 0
-    volScalarFieldValue alphamercury 0
+    volScalarFieldValue alpha.air 1
+    volScalarFieldValue alpha.water 0
+    volScalarFieldValue alpha.oil 0
+    volScalarFieldValue alpha.mercury 0
 );
 
 regions
@@ -30,10 +30,10 @@ regions
         box (0 0 -1) (1 1 1);
         fieldValues
         (
-            volScalarFieldValue alphawater 1
-            volScalarFieldValue alphaoil 0
-            volScalarFieldValue alphamercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.water 1
+            volScalarFieldValue alpha.oil 0
+            volScalarFieldValue alpha.mercury 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -41,10 +41,10 @@ regions
         box (0 -1 -1) (1 0 1);
         fieldValues
         (
-            volScalarFieldValue alphawater 0
-            volScalarFieldValue alphaoil 1
-            volScalarFieldValue alphamercury 0
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.water 0
+            volScalarFieldValue alpha.oil 1
+            volScalarFieldValue alpha.mercury 0
+            volScalarFieldValue alpha.air 0
         );
     }
     boxToCell
@@ -52,10 +52,10 @@ regions
         box (-1 -1 -1) (0 0 1);
         fieldValues
         (
-            volScalarFieldValue alphawater 0
-            volScalarFieldValue alphaoil 0
-            volScalarFieldValue alphamercury 1
-            volScalarFieldValue alphaair 0
+            volScalarFieldValue alpha.water 0
+            volScalarFieldValue alpha.oil 0
+            volScalarFieldValue alpha.mercury 1
+            volScalarFieldValue alpha.air 0
         );
     }
 );