TUT: finiteArea: clean up tutorials

tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/Us

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       areaVectorField;
-    location    "0";
     object      Us;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,28 +22,29 @@ boundaryField
 {
     inlet
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 
     outlet
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 
     side
     {
-        type slip;
+        type        slip;
     }
 
     symmetry
     {
-        type symmetry;
+        type        symmetry;
     }
 
     cylinder
     {
-        type slip;
+        type        slip;
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/h

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       areaScalarField;
-    location    "0";
     object      h;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -29,23 +28,24 @@ boundaryField
 
     outlet
     {
-        type zeroGradient;
+        type         zeroGradient;
     }
 
     side
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 
     symmetry
     {
-        type symmetry;
+        type        symmetry;
     }
 
     cylinder
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/finiteArea/liquidFilmFoam/cylinder/0.orig/manningField

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       areaScalarField;
-    location    "0";
     object      manningField;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,28 +22,29 @@ boundaryField
 {
     inlet
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 
     outlet
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 
     side
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 
     symmetry
     {
-        type symmetry;
+        type        symmetry;
     }
 
     cylinder
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/finiteArea/liquidFilmFoam/cylinder/Allclean

@@ -3,7 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
+
 cleanFaMesh
 
 #------------------------------------------------------------------------------

tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun

@@ -3,6 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 runApplication blockMesh
 
 runApplication makeFaMesh

tutorials/finiteArea/liquidFilmFoam/cylinder/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/liquidFilmFoam/cylinder/constant/transportProperties

@@ -15,15 +15,15 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-mug mug [0 2 -1 0 0 0 0] 0;
+mug     0;     // m2/s
-mul mul [0 2 -1 0 0 0 0] 1e-3;
+mul     1e-3;  // m2/s
 
-rhog rhog [ 1 -3  0 0 0 0 0 ] 1;
+rhog    1;     // kg/m3
-rhol rhol [ 1 -3  0 0 0 0 0 ] 100;
+rhol    100;   // kg/m3
 
-sigma sigma [ 1 0 -2 0 0 0 0 ] 0.1;
+sigma   0.1;   // kg/s2
 
-h0 h0 [ 0 1 0 0 0 0 0] 1e-10;
+h0      1e-10; // m
 
 
 // ************************************************************************* //

tutorials/finiteArea/liquidFilmFoam/cylinder/system/blockMeshDict

@@ -186,9 +186,5 @@ patches
     )
 );
 
-mergePatchPairs
-(
-);
-
 
 // ************************************************************************* //

tutorials/finiteArea/liquidFilmFoam/cylinder/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSchemes

@@ -10,20 +10,19 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
 {
-    ddt(h,Us) Euler;
+    ddt(h,Us)           Euler;
-    ddt(h) Euler;
+    ddt(h)              Euler;
 }
 
 gradSchemes
 {
-    default Gauss linear;
+    default             Gauss linear;
 }
 
 divSchemes
@@ -35,18 +34,18 @@ divSchemes
 
 laplacianSchemes
 {
-    default none;
+    default             none;
-    laplacian(h) Gauss linear corrected;
+    laplacian(h)        Gauss linear corrected;
 }
 
 interpolationSchemes
 {
-    default linear;
+    default             linear;
 }
 
 snGradSchemes
 {
-    default corrected;
+    default             corrected;
 }
 
 

tutorials/finiteArea/liquidFilmFoam/cylinder/system/faSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -38,12 +37,12 @@ solution
 {
     iterations 15;
 }
-//nOuterCorrectors 15;
 
 relaxationFactors
 {
-    h 0.5;
+    h   0.5;
-    Us 0.5;
+    Us  0.5;
 }
 
+
 // ************************************************************************* //

tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/liquidFilmFoam/cylinder/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cs

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       areaScalarField;
-    location    "0";
     object      Cs;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,4 +24,5 @@ boundaryField
 {
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/Cvf

@@ -10,14 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      Cvf;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 -1 0 0 0 0 0];
 
-
 internalField   uniform 0;
 
 boundaryField

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/0.orig/U

@@ -10,14 +10,12 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -1 0 0 0 0];
 
-
 internalField   uniform (0 0 0);
 
 boundaryField

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allclean

@@ -10,5 +10,6 @@ cleanPostProcessing
 cleanFaMesh
 
 rm -rf processor*
+rm -rf 0
 
 #------------------------------------------------------------------------------

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun

@@ -3,6 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 runApplication makeFaMesh
 
 runApplication $(getApplication)

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel

@@ -3,6 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 runApplication makeFaMesh
 
 runApplication decomposePar

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/constant/polyMesh/boundary

@@ -1,29 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  v2012                                 |
-|   \\  /    A nd           | Website:  www.openfoam.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-1
-(
-outer
-{
-    type patch;
-    nFaces 600;
-    startFace 4500;
-}
-)
-
-
-// ************************************************************************* //

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,7 +39,7 @@ laplacianSchemes
 
 interpolationSchemes
 {
-    default         linear;
+    default             linear;
 }
 
 snGradSchemes

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/faSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/system/fvSolution

@@ -10,14 +10,9 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
-{
-}
-
 
 // ************************************************************************* //

tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Cs

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       areaScalarField;
-    location    "0";
     object      Cs;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,20 +24,23 @@ boundaryField
 {
     inlet
     {
-        type fixedValue;
+        type        fixedValue;
-        value uniform 1;
+        value       uniform 1;
     }
+
     outlet
     {
-        type inletOutlet;
+        type        inletOutlet;
-        value uniform 1;
+        value       uniform 1;
-        phi phis;
+        phi         phis;
-        inletValue uniform 0;
+        inletValue  uniform 0;
     }
+
     bound
     {
-        type symmetry;
+        type        symmetry;
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/finiteArea/surfactantFoam/planeTransport/0.orig/Us

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       areaVectorField;
-    location    "0";
     object      Us;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -23,17 +22,20 @@ boundaryField
 {
     inlet
     {
-        type fixedValue;
+        type        fixedValue;
-        value $internalField;
+        value       $internalField;
     }
+
     outlet
     {
-        type zeroGradient;
+        type        zeroGradient;
     }
+
     bound
     {
-        type symmetry;
+        type        symmetry;
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/finiteArea/surfactantFoam/planeTransport/Allclean

@@ -3,7 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
+
 cleanFaMesh
 
 #------------------------------------------------------------------------------

tutorials/finiteArea/surfactantFoam/planeTransport/Allrun

@@ -3,6 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
+restore0Dir
+
 runApplication blockMesh
 
 runApplication makeFaMesh

tutorials/finiteArea/surfactantFoam/planeTransport/constant/transportProperties

@@ -10,12 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Ds              Ds [ 0 2 -1 0 0 0 0 ] 0.00001;
+Ds              0.00001; // m2/s
 
 
 // ************************************************************************* //

tutorials/finiteArea/surfactantFoam/planeTransport/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -48,4 +47,5 @@ functions
     #include "areaWrite"
 }
 
+
 // ************************************************************************* //

tutorials/finiteArea/surfactantFoam/planeTransport/system/faMeshDefinition

@@ -24,6 +24,7 @@ boundary
         ownerPolyPatch top;
         neighbourPolyPatch inlet;
     }
+
     outlet
     {
         type patch;
@@ -31,6 +32,7 @@ boundary
         // neighbourPolyPatch outlet;
         neighbourPolyPatch outflow;
     }
+
     bound
     {
         type symmetry;

tutorials/finiteArea/surfactantFoam/planeTransport/system/faSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,30 +21,30 @@ ddtSchemes
 
 gradSchemes
 {
-    default             Gauss linear;
+    default            Gauss linear;
-    grad(p)             Gauss linear;
+    grad(p)            Gauss linear;
 }
 
 divSchemes
 {
-    default             none;
+    default            none;
-    div(phis,Cs)        Gauss linear;
+    div(phis,Cs)       Gauss linear;
 }
 
 laplacianSchemes
 {
-    default             none;
+    default            none;
-    laplacian(Ds,Cs)    Gauss linear corrected;
+    laplacian(Ds,Cs)   Gauss linear corrected;
 }
 
 interpolationSchemes
 {
-    default         linear;
+    default            linear;
 }
 
 snGradSchemes
 {
-    default             corrected;
+    default            corrected;
 }
 
 

tutorials/finiteArea/surfactantFoam/planeTransport/system/faSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      faSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/finiteArea/surfactantFoam/planeTransport/system/fvSolution

@@ -10,14 +10,9 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-solvers
-{
-}
-
 
 // ************************************************************************* //