From c3c777ee0878c22a40b1b8811b278ca54a7c4d2b Mon Sep 17 00:00:00 2001
From: Chris Greenshields <http://cfd.direct>
Date: Wed, 1 Nov 2017 09:21:37 +0000
Subject: [PATCH] climbingRod tutorial: renamed water phase -> fluid

---
 .../climbingRod/0.orig/{alpha.water => alpha.fluid}    |  2 +-
 .../climbingRod/0.orig/{sigma.water => sigma.fluid}    |  2 +-
 .../climbingRod/constant/fvOptions                     |  4 ++--
 .../climbingRod/constant/thermophysicalProperties      |  2 +-
 ...Properties.water => thermophysicalProperties.fluid} |  0
 ...enceProperties.water => turbulenceProperties.fluid} |  0
 .../climbingRod/system/fvSchemes                       | 10 +++++-----
 .../climbingRod/system/fvSolution                      |  2 +-
 .../climbingRod/system/setFieldsDict                   |  4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)
 rename tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/{alpha.water => alpha.fluid} (97%)
 rename tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/{sigma.water => sigma.fluid} (97%)
 rename tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/{thermophysicalProperties.water => thermophysicalProperties.fluid} (100%)
 rename tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/{turbulenceProperties.water => turbulenceProperties.fluid} (100%)

diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/alpha.water b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/alpha.fluid
similarity index 97%
rename from tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/alpha.water
rename to tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/alpha.fluid
index 70e7c0f55f..b501ffa1d4 100644
--- a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/alpha.water
+++ b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/alpha.fluid
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha.water;
+    object      alpha.fluid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/sigma.water b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/sigma.fluid
similarity index 97%
rename from tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/sigma.water
rename to tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/sigma.fluid
index 9794cda548..a91a4181df 100644
--- a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/sigma.water
+++ b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/0.orig/sigma.fluid
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volSymmTensorField;
-    object      sigma;
+    object      sigma.fluid;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/fvOptions b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/fvOptions
index 276ebd3d17..7f9587cf08 100644
--- a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/fvOptions
+++ b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/fvOptions
@@ -19,8 +19,8 @@ stabilization
 {
     type            symmTensorPhaseLimitStabilization;
 
-    field           sigma.water;
-    rate            rLambda.water;
+    field           sigma.fluid;
+    rate            rLambda.fluid;
     residualAlpha   1e-3;
 }
 
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties
index c89cd4fa66..14c374cc0f 100644
--- a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties
+++ b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases (water air);
+phases (fluid air);
 
 pMin        10000;
 
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties.water b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties.fluid
similarity index 100%
rename from tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties.water
rename to tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/thermophysicalProperties.fluid
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/turbulenceProperties.water b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/turbulenceProperties.fluid
similarity index 100%
rename from tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/turbulenceProperties.water
rename to tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/constant/turbulenceProperties.fluid
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSchemes b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSchemes
index c02c0e62d5..2d89a76090 100644
--- a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSchemes
+++ b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSchemes
@@ -36,14 +36,14 @@ divSchemes
     div(phi,p)      Gauss upwind;
     div(rhoPhi,K)   Gauss upwind;
 
-    div(alphaRhoPhi.water,sigma.water) Gauss linearUpwind grad(sigma);
+    div(alphaRhoPhi.fluid,sigma.fluid) Gauss linearUpwind grad(sigma);
 
-    div(((alpha.water*thermo:rho.water)*sigma.water))   Gauss linear;
-    div((((alpha.water*thermo:rho.water)*nuM)*grad(U)))   Gauss linear;
-    div((((alpha.water*thermo:rho.water)*(thermo:mu.water|thermo:rho.water))*dev2(T(grad(U))))) Gauss linear;
+    div(((alpha.fluid*thermo:rho.fluid)*sigma.fluid))   Gauss linear;
+    div((((alpha.fluid*thermo:rho.fluid)*nuM)*grad(U)))   Gauss linear;
+    div((((alpha.fluid*thermo:rho.fluid)*(thermo:mu.fluid|thermo:rho.fluid))*dev2(T(grad(U))))) Gauss linear;
 
     div((((alpha.air*thermo:rho.air)*nuEff.air)*dev2(T(grad(U))))) Gauss linear;
-    div((((alpha.water*thermo:rho.water)*nuEff.water)*dev2(T(grad(U))))) Gauss linear;
+    div((((alpha.fluid*thermo:rho.fluid)*nuEff.fluid)*dev2(T(grad(U))))) Gauss linear;
 }
 
 laplacianSchemes
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSolution b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSolution
index a31971f0f7..b1e33650a6 100644
--- a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSolution
+++ b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    "alpha.water.*"
+    "alpha.fluid.*"
     {
         nAlphaCorr      2;
         nAlphaSubCycles 1;
diff --git a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/setFieldsDict b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/setFieldsDict
index f865153254..befcce7a4a 100644
--- a/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/setFieldsDict
+++ b/tutorials/multiphase/compressibleInterPhaseTransportFoam/climbingRod/system/setFieldsDict
@@ -17,7 +17,7 @@ FoamFile
 
 defaultFieldValues
 (
-    volScalarFieldValue alpha.water 0
+    volScalarFieldValue alpha.fluid 0
 );
 
 regions
@@ -27,7 +27,7 @@ regions
         box (0 0 -1) (1 0.077 1);
         fieldValues
         (
-            volScalarFieldValue alpha.water 1
+            volScalarFieldValue alpha.fluid 1
         );
     }
 );