multiphase: Update phase-naming to use the new convention e.g. alpha.water

2025-11-28 03:28:01 +00:00 · 2013-08-13 23:21:46 +01:00
parent 208f63027d
commit 2780df8365
177 changed files with 313 additions and 622 deletions
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/Allclean
@ -13,12 +13,12 @@ do

    if [ "$case" = "damBreak" ]
    then
-        cp $case/0/alpha1.org $case/0/alpha1
+        cp $case/0/alpha.water.org $case/0/alpha.water
    fi

    if [ "$case" = "damBreakPorousBaffle" ]
    then
-        cp $case/0/alpha1.org $case/0/alpha1
+        cp $case/0/alpha.water.org $case/0/alpha.water
    fi

 done
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@ -23,9 +23,6 @@ setDamBreakFine ()
    mv temp.$$ $controlDict
 }

-# Do damBreakPorousBaffle
-(cd damBreakPorousBaffle && foamRunTutorials)
-
 # Do damBreak
 (cd damBreak && foamRunTutorials)

@ -37,7 +34,7 @@ cloneCase damBreak damBreakFine

    # Modify case
    setDamBreakFine
-    cp ../damBreak/0/alpha1.org 0/alpha1
+    cp ../damBreak/0/alpha.water.org 0/alpha.water
    # And execute
    runApplication blockMesh
    runApplication setFields
--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water
@ -10,7 +10,7 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha.water.org
@ -10,7 +10,7 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/transportProperties
@ -15,14 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (water air);

-phase1
+water
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@ -44,7 +39,7 @@ phase1
    }
 }

-phase2
+air
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution
@ -17,7 +17,7 @@ FoamFile

 solvers
 {
-    alpha1
+    alpha.water
    {
        nAlphaCorr      1;
        nAlphaSubCycles 4;
--- a/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreak/system/setFieldsDict
@ -17,7 +17,7 @@ FoamFile

 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );

 regions
@ -27,7 +27,7 @@ regions
        box (0 0 -1) (0.1461 0.292 1);
        fieldValues
        (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
        );
    }
 );
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water
@ -11,7 +11,7 @@ FoamFile
    format      ascii;
    class       volScalarField;
    location    "0";
-    object      alpha1.org;
+    object      alpha.water.org;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/alpha.water.org
@ -11,7 +11,7 @@ FoamFile
    format      ascii;
    class       volScalarField;
    location    "0";
-    object      alpha1.org;
+    object      alpha.water.org;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/epsilon
@ -24,6 +24,7 @@ boundaryField
    leftWall
    {
        type            epsilonWallFunction;
+        value           uniform 0.1;
        Cmu             0.09;
        kappa           0.41;
        E               9.8;
@ -32,6 +33,7 @@ boundaryField
    rightWall
    {
        type            epsilonWallFunction;
+        value           uniform 0.1;
        Cmu             0.09;
        kappa           0.41;
        E               9.8;
@ -40,6 +42,7 @@ boundaryField
    lowerWall
    {
        type            epsilonWallFunction;
+        value           uniform 0.1;
        Cmu             0.09;
        kappa           0.41;
        E               9.8;
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/0/p_rgh
@ -25,16 +25,19 @@ boundaryField
    {
        type            fixedFluxPressure;
        gradient        uniform 0;
+        value           uniform 0;
    }
    rightWall
    {
        type            fixedFluxPressure;
        gradient        uniform 0;
+        value           uniform 0;
    }
    lowerWall
    {
        type            fixedFluxPressure;
        gradient        uniform 0;
+        value           uniform 0;
    }
    atmosphere
    {
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/constant/transportProperties
@ -15,14 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (water air);

-phase1
+water
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@ -44,7 +39,7 @@ phase1
    }
 }

-phase2
+air
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/fvSolution
@ -17,7 +17,7 @@ FoamFile

 solvers
 {
-    alpha1
+    alpha.water
    {
        nAlphaCorr      1;
        nAlphaSubCycles 4;
--- a/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/damBreakPorousBaffle/system/setFieldsDict
@ -17,7 +17,7 @@ FoamFile

 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );

 regions
@ -27,7 +27,7 @@ regions
        box (0 0 -1) (0.1461 0.292 1);
        fieldValues
        (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
        );
    }
 );
--- a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions

-rm 0/alpha1.gz 0/alpha1 2>/dev/null
+rm 0/alpha.water.gz 0/alpha.water 2>/dev/null
 rm -rf *Flux

 cleanCase
--- a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
@ -17,7 +17,7 @@ while [ "$i" -lt 3 ] ; do
    i=`expr $i + 1`
 done

-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water
 runApplication setFields

 runApplication $application
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
@ -55,7 +55,7 @@ fluxRequired
    default         no;
    p_rgh;
    pcorr;
-    alpha1;
+    alpha.water;
 }


--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
@ -17,7 +17,7 @@ FoamFile

 solvers
 {
-    alpha1
+    alpha.water
    {
        nAlphaCorr      1;
        nAlphaSubCycles 3;
--- a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
@ -17,7 +17,7 @@ FoamFile

 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );

 regions
@ -27,7 +27,7 @@ regions
        box (0 0 0) (50 130 27);
        fieldValues
        (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
        );
    }

@ -36,7 +36,7 @@ regions
        box (0 0 0) (50 10.0001 24);
        fieldValues
        (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
        );
    }
 );
--- a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
@ -15,14 +15,16 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-phase1
+phases (water air);
+
+water
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ]  1e-06;
    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
 }

-phase2
+air
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ]  1.48e-05;
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
@ -56,7 +56,7 @@ fluxRequired
    default         no;
    p_rgh;
    pcorr;
-    alpha1;
+    alpha.water;
 }


--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
@ -17,7 +17,7 @@ FoamFile

 solvers
 {
-    alpha1
+    alpha.water
    {
        nAlphaCorr      1;
        nAlphaSubCycles 3;
--- a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
@ -17,7 +17,7 @@ FoamFile

 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );

 regions
@ -27,7 +27,7 @@ regions
        box (-10 -20 -10) (200 20 4);
        fieldValues
        (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
        );
    }
 );
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/U
@ -26,6 +26,7 @@ boundaryField
    {
        type            variableHeightFlowRateInletVelocity;
        flowRate        $inletFlowRate;
+        alpha           alpha.water;
        value           uniform (0 0 0);
    }

--- a/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/0.org/alpha.water.org
@ -10,7 +10,7 @@ FoamFile
    version     2.0;
    format      ascii;
    class       volScalarField;
-    object      alpha1;
+    object      alpha.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/Allrun
@ -7,7 +7,7 @@ cp -r 0.org 0 > /dev/null 2>&1

 runApplication blockMesh

-cp 0/alpha1.org 0/alpha1
+cp 0/alpha.water.org 0/alpha.water

 runApplication setFields

--- a/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/constant/transportProperties
@ -15,14 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-twoPhase
-{
-    transportModel  twoPhase;
-    phase1          phase1;
-    phase2          phase2;
-}
+phases (water air);

-phase1
+water
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ] 1e-06;
@ -44,7 +39,7 @@ phase1
    }
 }

-phase2
+air
 {
    transportModel  Newtonian;
    nu              nu [ 0 2 -1 0 0 0 0 ] 1.48e-05;
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/fvSolution
@ -16,7 +16,7 @@ FoamFile

 solvers
 {
-    alpha1
+    alpha.water
    {
        nAlphaCorr      1;
        nAlphaSubCycles 2;
--- a/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
+++ b/tutorials/multiphase/interFoam/ras/weirOverflow/system/setFieldsDict
@ -16,7 +16,7 @@ FoamFile

 defaultFieldValues
 (
-    volScalarFieldValue alpha1 0
+    volScalarFieldValue alpha.water 0
 );

 regions
@ -27,7 +27,7 @@ regions

        fieldValues
        (
-            volScalarFieldValue alpha1 1
+            volScalarFieldValue alpha.water 1
        );
    }
 );