Merge branch 'tutorial-lagrangian' into 'develop'

TUT: lagrangian: clean up tutorials

See merge request Development/openfoam!429

tutorials/lagrangian/DPMFoam/Goldschmidt/0/U.air

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      binary;
     class       volVectorField;
-    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/DPMFoam/Goldschmidt/0/p

@@ -47,4 +47,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/DPMFoam/Goldschmidt/constant/g

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

tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -100,25 +99,7 @@ subModels
     {
         patches
         (
-            top
+            "(top|bottom|walls|frontAndBack)"
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            bottom
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            walls
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            frontAndBack
             {
                 type rebound;
                 e    0.97;
@@ -127,15 +108,6 @@ subModels
         );
     }
 
-    StandardWallInteractionCoeffs
-    {
-        type rebound;
-        e    0.97;
-        mu   0.09;
-    }
-
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -176,8 +148,6 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
 

tutorials/lagrangian/DPMFoam/Goldschmidt/constant/transportProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1e-05;
 
+
 // ************************************************************************* //

tutorials/lagrangian/DPMFoam/Goldschmidt/constant/turbulenceProperties.air

@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/lagrangian/DPMFoam/Goldschmidt/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/lagrangian/DPMFoam/Goldschmidt/system/decomposeParDict

@@ -23,4 +23,5 @@ coeffs
     n           (1 6 1);
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -60,9 +59,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //

tutorials/lagrangian/DPMFoam/Goldschmidt/system/mapFieldsDict

@@ -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       dictionary;
-    object      mapFieldsDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// List of pairs of source/target patches for mapping
-patchMap
-(
-);
-
-// List of target patches cutting the source domain (these need to be
-// handled specially e.g. interpolated from internal values)
-cuttingPatches
-(
-);
-
-// ************************************************************************* //

tutorials/lagrangian/MPPICDyMFoam/column/0/U.air

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
     object      U;
 }

tutorials/lagrangian/MPPICDyMFoam/column/constant/kinematicCloudProperties

@@ -90,19 +90,7 @@ subModels
     {
         patches
         (
-            sides
+            "(sides|top|bottom)"
-            {
-                type rebound;
-                e    1;
-                mu   0.09;
-            }
-            top
-            {
-                type rebound;
-                e    1;
-                mu   0.09;
-            }
-            bottom
             {
                 type rebound;
                 e    1;
@@ -111,8 +99,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel implicit;
@@ -175,11 +161,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 

tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/0/T

@@ -1,48 +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       volScalarField;
-    object      T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 1 0 0 0];
-
-internalField   uniform 350;
-
-boundaryField
-{
-    AMI1a
-    {
-        type            cyclicAMI;
-        value           $internalField;
-    }
-
-    AMI1b
-    {
-        type            cyclicAMI;
-        value           $internalField;
-    }
-
-    ".*"
-    {
-        type            zeroGradient;
-        value           $internalField;
-    }
-
-    defaultFaces
-    {
-        type            empty;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/MPPICDyMFoam/denseRotor2DAMI/constant/kinematicCloudProperties

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    object      particleProperties;
+    object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -76,14 +76,14 @@ subModels
             parcelsPerSecond  20000;
 
             sizeDistribution
-	    {
+            {
-	        type uniform;
+                type uniform;
                 uniformDistribution
                 {
                     minValue        5e-03;
                     maxValue        5e-03;
                 }
-	    }
+            }
 
             flowRateProfile constant 1;
             massTotal       2000000;
@@ -94,14 +94,8 @@ subModels
 
     dispersionModel none;
 
-    patchInteractionModel none;
-
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
-    collisionModel none;
-
     patchInteractionModel standardWallInteraction;
 
     standardWallInteractionCoeffs
@@ -158,11 +152,8 @@ subModels
             e 0.8;
         }
     }
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 

tutorials/lagrangian/MPPICFoam/Goldschmidt/0/U.air

@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/MPPICFoam/Goldschmidt/0/p

@@ -44,4 +44,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 -9.81);
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/kinematicCloudProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -94,25 +93,7 @@ subModels
     {
         patches
         (
-            top
+            "(top|bottom|walls|frontAndBack)"
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            bottom
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            walls
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            frontAndBack
             {
                 type rebound;
                 e    0.97;
@@ -121,8 +102,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel explicit;
@@ -185,11 +164,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 

tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/transportProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1.568e-05;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/Goldschmidt/constant/turbulenceProperties.air

@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/Goldschmidt/system/decomposeParDict

@@ -23,4 +23,5 @@ coeffs
     n           (1 5 1);
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSchemes

@@ -16,7 +16,7 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes

tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,9 +67,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/column/0/U.air

@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -37,4 +36,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/column/0/p

@@ -38,4 +38,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/column/constant/g

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

tutorials/lagrangian/MPPICFoam/column/constant/kinematicCloudProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,7 +58,6 @@ subModels
         {
             alphac alpha.air;
         }
-        //gravity;
     }
 
     injectionModels
@@ -92,19 +90,7 @@ subModels
     {
         patches
         (
-            sides
+            "(sides|top|bottom)"
-            {
-                type rebound;
-                e    1;
-                mu   0;
-            }
-            top
-            {
-                type rebound;
-                e    1;
-                mu   0;
-            }
-            bottom
             {
                 type rebound;
                 e    1;
@@ -113,8 +99,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel implicit;
@@ -177,11 +161,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 

tutorials/lagrangian/MPPICFoam/column/constant/transportProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1e-05;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/column/constant/turbulenceProperties.air

@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/column/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/column/system/fvSchemes

@@ -16,12 +16,12 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 d2dt2Schemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes

tutorials/lagrangian/MPPICFoam/column/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -66,9 +65,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/cyclone/0.orig/U.air

@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/MPPICFoam/cyclone/0.orig/k.air

@@ -41,4 +41,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/lagrangian/MPPICFoam/cyclone/0.orig/nut.air

@@ -39,4 +39,5 @@ boundaryField
     }
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// ************************************************************************* //

tutorials/lagrangian/MPPICFoam/cyclone/Allclean

@@ -3,8 +3,8 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/CleanFunctions      # Tutorial clean functions
 #------------------------------------------------------------------------------
 
-cleanCase
+cleanCase0
 
-# rm -f constant/triSurface/cyclone.stl*
+rm -rf constant/triSurface
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/MPPICFoam/cyclone/Allrun

@@ -3,7 +3,11 @@ cd "${0%/*}" || exit                                # Run from this directory
 . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions        # Tutorial run functions
 #------------------------------------------------------------------------------
 
-cp $FOAM_TUTORIALS/resources/geometry/cyclone.stl.gz constant/triSurface
+[ -d constant/triSurface ] || mkdir -p constant/triSurface
+
+cp -f "$FOAM_TUTORIALS"/resources/geometry/cyclone.stl.gz constant/triSurface
+
+restore0Dir
 
 runApplication blockMesh
 
@@ -11,6 +15,6 @@ runApplication snappyHexMesh -overwrite
 
 runApplication decomposePar
 
-runParallel MPPICFoam
+runParallel $(getApplication)
 
 #------------------------------------------------------------------------------

tutorials/lagrangian/MPPICFoam/cyclone/constant/g

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -18,4 +17,5 @@ FoamFile
 dimensions      [0 1 -2 0 0 0 0];
 value           (0 0 -9.81);
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/cyclone/constant/kinematicCloudProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -99,13 +98,7 @@ subModels
     {
         patches
         (
-            walls
+            "(walls|inlet)"
-            {
-                type rebound;
-                e    0.97;
-                mu   0.09;
-            }
-            inlet
             {
                 type rebound;
                 e    0.97;
@@ -118,8 +111,6 @@ subModels
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel implicit;
@@ -172,11 +163,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 

tutorials/lagrangian/MPPICFoam/cyclone/constant/transportProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1.568e-05;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/cyclone/constant/triSurface/README

@@ -1,4 +0,0 @@
-Directory to house tri-surfaces
-
-The Allrun script copies the surface from the $FOAM_TUTORIALS/resources/geometry
-directory

tutorials/lagrangian/MPPICFoam/cyclone/constant/turbulenceProperties.air

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/MPPICFoam/cyclone/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/cyclone/system/decomposeParDict

@@ -23,4 +23,5 @@ coeffs
     n           (2 2 3);
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/cyclone/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -68,9 +67,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/injectionChannel/0/U.air

@@ -8,9 +8,8 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/MPPICFoam/injectionChannel/0/p

@@ -50,4 +50,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/injectionChannel/constant/g

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

tutorials/lagrangian/MPPICFoam/injectionChannel/constant/kinematicCloudProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -135,29 +134,19 @@ subModels
     {
         patches
         (
-            frontAndBack
+            "(frontAndBack|walls)"
             {
                 type rebound;
                 e    1;
                 mu   0;
             }
-
+            "(lowerInlet|upperInlet|outlet)"
-            walls
-            {
-                type rebound;
-                e    1;
-                mu   0;
-            }
-
-            "lowerInlet|upperInlet|outlet"
             {
                 type escape;
             }
         );
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     packingModel none;
@@ -187,11 +176,8 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
-
 cloudFunctions
 {}
 

tutorials/lagrangian/MPPICFoam/injectionChannel/constant/transportProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ rho.air         1.2;
 transportModel  Newtonian;
 nu              1e-05;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/injectionChannel/constant/turbulenceProperties.air

@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      turbulenceProperties.air;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 simulationType  laminar;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/injectionChannel/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,4 +44,5 @@ timePrecision   6;
 
 runTimeModifiable yes;
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSchemes

@@ -16,7 +16,7 @@ FoamFile
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes
@@ -47,4 +47,5 @@ snGradSchemes
     default         corrected;
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -59,9 +58,5 @@ PIMPLE
     pRefValue       0;
 }
 
-relaxationFactors
-{
-}
-
 
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CH4

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CH4;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CO;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/CO2

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      CO2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/G

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      G;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            MarshakRadiation;
         value           uniform 0;
     }
+
     bottom
     {
         type            MarshakRadiation;
         value           uniform 0;
     }
+
     walls
     {
         type            MarshakRadiation;
         value           uniform 0;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/H2O

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      H2O;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/N2

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      N2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/O2

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      O2;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/T

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      T;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/U

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volVectorField;
-    location    "0";
     object      U;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -25,18 +24,22 @@ boundaryField
     {
         type            noSlip;
     }
+
     bottom
     {
         type            noSlip;
     }
+
     walls
     {
         type            noSlip;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/alphat

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      alphat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     bottom
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     walls
     {
         type            compressible::alphatWallFunction;
         value           uniform 0;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/epsilon

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      epsilon;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            epsilonWallFunction;
         value           uniform 5390.5;
     }
+
     bottom
     {
         type            epsilonWallFunction;
         value           uniform 5390.5;
     }
+
     walls
     {
         type            epsilonWallFunction;
         value           uniform 5390.5;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/k

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      k;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            kqRWallFunction;
         value           uniform 37.5;
     }
+
     bottom
     {
         type            kqRWallFunction;
         value           uniform 37.5;
     }
+
     walls
     {
         type            kqRWallFunction;
         value           uniform 37.5;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/nut

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      nut;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -26,20 +25,24 @@ boundaryField
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     bottom
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     walls
     {
         type            nutkWallFunction;
         value           uniform 0;
     }
+
     symmetry
     {
         type            symmetryPlane;
     }
+
     frontAndBack
     {
         type            empty;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0.orig/p

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    location    "0";
     object      p;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/boundaryRadiationProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      boundaryRadiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -22,4 +21,5 @@ FoamFile
     absorptivity    0.0;
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/chemistryProperties

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Positions

@@ -10,12 +10,11 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    location    "";
     class       vectorField;
     object      coalCloud1Positions;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 (
 (0.005 0.5 0.05)
 (0.010 0.5 0.05)
@@ -45,4 +44,6 @@ FoamFile
 (0.040 0.7 0.05)
 (0.045 0.7 0.05)
 )
+
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/combustionProperties

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/foam.dat

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      foam.dat;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/fvOptions

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/g

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestonePositions

@@ -9,11 +9,11 @@ FoamFile
 {
     version     2.0;
     format      ascii;
-    location    "";
     class       vectorField;
     object      limestonePositions;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 (
 (0.0075 0.55 0.05)
 (0.0125 0.55 0.05)
@@ -34,4 +34,6 @@ FoamFile
 (0.0425 0.45 0.05)
 (0.0475 0.45 0.05)
 )
+
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/radiationProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      radiationProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -65,4 +64,5 @@ cloudScatterCoeffs
 
 transmissivityModel none;
 
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/thermophysicalProperties

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/turbulenceProperties

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

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/controlDict

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,8 +54,8 @@ functions
 {
     #include "dataCloud"
     #include "vtkCloud"
-
     #include "runTimePostProcessing"
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/dataCloud

@@ -11,4 +11,5 @@ dataCloud
     field   d;
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/decomposeParDict

@@ -18,13 +18,5 @@ numberOfSubdomains 4;
 
 method          scotch;
 
-coeffs
-{
-    n           (2 2 1);
-}
-
-distributed     no;
-
-roots           ( );
 
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -32,7 +31,7 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
     div(phi,K)      Gauss linear;
-    div(phi,h)     Gauss upwind;
+    div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(U)          Gauss linear;

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -83,7 +82,6 @@ PIMPLE
     momentumPredictor yes;
 }
 
-
 relaxationFactors
 {
     fields

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/runTimePostProcessing

@@ -115,4 +115,5 @@ postPro1
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict

@@ -12,7 +12,6 @@ FoamFile
     class       dictionary;
     object      topoSetDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 actions

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/0.orig/U

@@ -55,4 +55,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allclean

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

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/Allrun

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

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/dynamicMeshDict

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

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/g

@@ -10,13 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       uniformDimensionedVectorField;
-    location    "constant";
     object      g;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-
 value           (0 -9.81 0);
 
 

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/kinematicCloudProperties

@@ -10,7 +10,6 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      kinematicCloudProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -100,8 +99,6 @@ subModels
         mu   0.09;
     }
 
-    heatTransferModel none;
-
     surfaceFilmModel none;
 
     collisionModel pairCollision;
@@ -142,8 +139,6 @@ subModels
     }
 
     stochasticCollisionModel none;
-
-    radiation off;
 }
 
 

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/transportProperties

@@ -10,16 +10,15 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
-    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 transportModel  Newtonian;
 
-nu              [0 2 -1 0 0 0 0] 1e-05;
+nu              1e-05;
 
-rhoInf          [1 -3 0 0 0 0 0] 1.2;
+rhoInf          1.2;
 
 
 // ************************************************************************* //

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/constant/turbulenceProperties

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

tutorials/lagrangian/icoUncoupledKinematicParcelDyMFoam/mixerVesselAMI2D/system/controlDict

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