TUT: multiphase: clean up tutorials

2025-12-28 03:37:59 +00:00 · 2021-06-04 13:32:37 +01:00
parent 3a858ac682
commit 91c1e8efe2
1811 changed files with 1797 additions and 3089 deletions
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.air
@ -45,4 +45,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/T.water
@ -45,4 +45,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/Theta
@ -44,4 +44,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.air
@ -8,7 +8,7 @@
 FoamFile
 {
    version     2.0;
-    format      binary;
+    format      ascii;
    class       volVectorField;
    object      U.air;
 }
@ -40,4 +40,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/U.water
@ -8,7 +8,7 @@
 FoamFile
 {
    version     2.0;
-    format      binary;
+    format      ascii;
    class       volVectorField;
    object      U.water;
 }
@ -40,4 +40,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/alpha.air
@ -40,4 +40,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p
@ -39,4 +39,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/0.orig/p_rgh
@ -40,4 +40,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/g
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       uniformDimensionedVectorField;
-    location    "constant";
    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/phaseProperties
@ -10,12 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-phases (air water);
+phases          (air water);

 air
 {
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.air
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/thermophysicalProperties.water
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.air
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/constant/turbulenceProperties.water
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/blockMeshDict
@ -58,4 +58,5 @@ mergePatchPairs
 (
 );

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/controlDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -51,7 +50,6 @@ maxCo           0.5;

 maxDeltaT       1;

-
 functions
 {
    add1
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSchemes
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/fvSolution
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumn/system/setFieldsDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.air
@ -45,4 +45,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/T.water
@ -45,4 +45,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/Theta
@ -44,4 +44,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.air
@ -8,7 +8,7 @@
 FoamFile
 {
    version     2.0;
-    format      binary;
+    format      ascii;
    class       volVectorField;
    object      U.air;
 }
@ -40,4 +40,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/U.water
@ -8,7 +8,7 @@
 FoamFile
 {
    version     2.0;
-    format      binary;
+    format      ascii;
    class       volVectorField;
    object      U.water;
 }
@ -40,4 +40,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/alpha.air
@ -40,4 +40,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/kappai.air
@ -45,4 +45,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p
@ -39,4 +39,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/0.orig/p_rgh
@ -40,4 +40,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/g
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       uniformDimensionedVectorField;
-    location    "constant";
    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/phaseProperties
@ -10,12 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-phases (air water);
+phases          (air water);

 air
 {
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.air
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/thermophysicalProperties.water
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.air
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-simulationType  laminar;
+simulationType laminar;
+

 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/constant/turbulenceProperties.water
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/controlDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSchemes
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/fvSolution
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/bubbleColumnIATE/system/setFieldsDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.air
@ -45,4 +45,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/T.particles
@ -44,4 +44,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/Theta.particles
@ -44,4 +44,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.air
@ -46,4 +46,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/U.particles
@ -44,4 +44,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alpha.particles
@ -41,4 +41,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/alphat.particles
@ -44,4 +44,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/epsilon.air
@ -46,4 +46,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/k.air
@ -46,4 +46,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.air
@ -44,4 +44,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/nut.particles
@ -44,4 +44,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p
@ -44,4 +44,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/0.orig/p_rgh
@ -45,4 +45,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/g
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       uniformDimensionedVectorField;
-    location    "constant";
    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/phaseProperties
@ -10,12 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-phases (particles air);
+phases          (particles air);

 particles
 {
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.air
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/thermophysicalProperties.particles
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.air
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/constant/turbulenceProperties.particles
@ -10,18 +10,18 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.particles;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-simulationType  RAS;
+simulationType      RAS;

 RAS
 {
-    RASModel phasePressure;
+    RASModel        phasePressure;

    turbulence      on;
+
    printCoeffs     on;

    kineticTheoryCoeffs
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/controlDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -51,7 +50,6 @@ maxCo           0.9;

 maxDeltaT       1e-05;

-
 functions
 {
    fieldAverage1
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSchemes
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -59,4 +58,5 @@ snGradSchemes
    bounded     uncorrected;
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/fvSolution
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -21,9 +20,7 @@ solvers
    {
        nAlphaCorr      1;
        nAlphaSubCycles 2;
-
        smoothLimiter   0.1;
-
        implicitPhasePressure yes;
        solver          smoothSolver;
        smoother        symGaussSeidel;
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/fluidisedBed/system/setFieldsDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.air
@ -34,4 +34,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/T.water
@ -34,4 +34,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.air
@ -8,7 +8,7 @@
 FoamFile
 {
    version     2.0;
-    format      binary;
+    format      ascii;
    class       volVectorField;
    object      U.air;
 }
@ -34,4 +34,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/U.water
@ -8,7 +8,7 @@
 FoamFile
 {
    version     2.0;
-    format      binary;
+    format      ascii;
    class       volVectorField;
    object      U.water;
 }
@ -34,4 +34,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/alpha.air
@ -34,4 +34,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p
@ -33,4 +33,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/0.orig/p_rgh
@ -34,4 +34,5 @@ boundaryField
    }
 }

-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/fvOptions
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      fvOptions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/g
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       uniformDimensionedVectorField;
-    location    "constant";
    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/phaseProperties
@ -10,12 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-phases (air water);
+phases          (air water);

 air
 {
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.air
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/thermophysicalProperties.water
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.air
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/constant/turbulenceProperties.water
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/blockMeshDict
@ -55,4 +55,5 @@ mergePatchPairs
 (
 );

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/controlDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSchemes
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/fvSolution
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/injection/system/setFieldsDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.air
@ -41,4 +41,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/T.water
@ -41,4 +41,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/Theta
@ -41,4 +41,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.air
@ -41,4 +41,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/U.water
@ -41,4 +41,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/alpha.air
@ -41,4 +41,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p
@ -43,4 +43,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0.orig/p_rgh
@ -43,4 +43,5 @@ boundaryField
    }
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/Allrun.pre
@ -4,7 +4,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------

 m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 runApplication blockMesh

 runApplication topoSet
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/MRFProperties
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      MRFProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -28,4 +27,5 @@ MRF1
    omega     constant 10.472;
 }

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/g
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       uniformDimensionedVectorField;
-    location    "constant";
    object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/phaseProperties
@ -10,12 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      phaseProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-phases (air water);
+phases          (air water);

 air
 {
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.air
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/thermophysicalProperties.water
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      thermophysicalProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.air
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/constant/turbulenceProperties.water
@ -10,11 +10,11 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "constant";
    object      turbulenceProperties.water;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

 simulationType  laminar;

+
 // ************************************************************************* //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/controlDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSchemes
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/fvSolution
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/system/topoSetDict
@ -10,7 +10,6 @@ FoamFile
    version     2.0;
    format      ascii;
    class       dictionary;
-    location    "system";
    object      topoSetDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -26,4 +25,5 @@ actions
    }
 );

+
 // ************************************************************************* //