Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/preProcessing/changeDictionary/changeDictionary.C

@@ -52,6 +52,7 @@ Description
         }
     }
     \endverbatim
+    Replacement entries starting with '~' will remove the entry.
 
 Usage
 
@@ -172,6 +173,46 @@ bool addEntry
 }
 
 
+
+// List of indices into thisKeys
+labelList findMatches
+(
+    const HashTable<wordList, word>& shortcuts,
+    const wordList& shortcutNames,
+    const wordList& thisKeys,
+    const keyType& key
+)
+{
+    labelList matches;
+
+    if (key.isPattern())
+    {
+        // Wildcard match
+        matches = findStrings(key, thisKeys);
+
+    }
+    else if (shortcuts.size())
+    {
+        // See if patchGroups expand to valid thisKeys
+        labelList indices = findStrings(key, shortcutNames);
+        forAll(indices, i)
+        {
+            const word& name = shortcutNames[indices[i]];
+            const wordList& keys = shortcuts[name];
+            forAll(keys, j)
+            {
+                label index = findIndex(thisKeys, keys[j]);
+                if (index != -1)
+                {
+                    matches.append(index);
+                }
+            }
+        }
+    }
+    return matches;
+}
+
+
 // Dictionary merging/editing.
 // literalRE:
 // - true: behave like dictionary::merge, i.e. add regexps just like
@@ -185,6 +226,8 @@ bool merge
     const HashTable<wordList, word>& shortcuts
 )
 {
+    const wordList shortcutNames(shortcuts.toc());
+
     bool changed = false;
 
     // Save current (non-wildcard) keys before adding items.
@@ -203,7 +246,18 @@ bool merge
     {
         const keyType& key = mergeIter().keyword();
 
-        if (literalRE || !(key.isPattern() || shortcuts.found(key)))
+        if (key[0] == '~')
+        {
+            word eraseKey = key(1, key.size()-1);
+            if (thisDict.remove(eraseKey))
+            {
+                // Mark thisDict entry as having been match for wildcard
+                // handling later on.
+                thisKeysSet.erase(eraseKey);
+            }
+            changed = true;
+        }
+        else if (literalRE || !(key.isPattern() || shortcuts.found(key)))
         {
             entry* entryPtr = thisDict.lookupEntryPtr
             (
@@ -255,34 +309,43 @@ bool merge
         {
             const keyType& key = mergeIter().keyword();
 
+            if (key[0] == '~')
+            {
+                word eraseKey = key(1, key.size()-1);
+
                 // List of indices into thisKeys
-            labelList matches;
+                labelList matches
+                (
+                    findMatches
+                    (
+                        shortcuts,
+                        shortcutNames,
+                        thisKeys,
+                        eraseKey
+                    )
+                );
 
-            if (key.isPattern())
+                // Remove all matches
+                forAll(matches, i)
                 {
-                // Wildcard match
+                    const word& thisKey = thisKeys[matches[i]];
-                matches = findStrings(key, thisKeys);
+                    thisKeysSet.erase(thisKey);
-
                 }
-            else if (shortcuts.size())
+                changed = true;
+            }
+            else
             {
-                // See if patchGroups expand to valid thisKeys
+                // List of indices into thisKeys
-                const wordList shortcutNames = shortcuts.toc();
+                labelList matches
-                labelList indices = findStrings(key, shortcutNames);
+                (
-                forAll(indices, i)
+                    findMatches
-                {
+                    (
-                    const word& name = shortcutNames[indices[i]];
+                        shortcuts,
-                    const wordList& keys = shortcuts[name];
+                        shortcutNames,
-                    forAll(keys, j)
+                        thisKeys,
-                    {
+                        key
-                        label index = findIndex(thisKeys, keys[j]);
+                    )
-                        if (index != -1)
+                );
-                        {
-                            matches.append(index);
-                        }
-                    }
-                }
-            }
 
                 // Add all matches
                 forAll(matches, i)
@@ -312,6 +375,7 @@ bool merge
                 }
             }
         }
+    }
 
     return changed;
 }

src/OSspecific/POSIX/fileMonitor.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C

@@ -72,7 +72,7 @@ flowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF),
-    rhoInlet_(0.0)
+    rhoInlet_(dict.lookupOrDefault<scalar>("rhoInlet", -VGREAT))
 {
     if (dict.found("volumetricFlowRate"))
     {
@@ -107,14 +107,9 @@ flowRateInletVelocityFvPatchVectorField
             vectorField("value", dict, p.size())
         );
     }
-    else if (volumetric_)
-    {
-        evaluate(Pstream::blocking);
-    }
     else
     {
-        rhoInlet_ = readScalar(dict.lookup("rhoInlet"));
+        evaluate(Pstream::blocking);
-        updateCoeffs(rhoInlet_);
     }
 }
 
@@ -202,11 +197,31 @@ void Foam::flowRateInletVelocityFvPatchVectorField::updateCoeffs()
     else
     {
         // mass flow-rate
+        if
+        (
+            patch().boundaryMesh().mesh().foundObject<volScalarField>(rhoName_)
+        )
+        {
             const fvPatchField<scalar>& rhop =
                 patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
             operator==(n*avgU/rhop);
         }
+        else
+        {
+            // Use constant density
+            if (rhoInlet_ < 0)
+            {
+                FatalErrorIn
+                (
+                    "flowRateInletVelocityFvPatchVectorField::updateCoeffs()"
+                )   << "Did not find registered density field " << rhoName_
+                    << " and no constant density 'rhoInlet' specified"
+                    << exit(FatalError);
+            }
+            operator==(n*avgU/rhoInlet_);
+        }
+    }
 
     fixedValueFvPatchField<vector>::updateCoeffs();
 }
@@ -219,7 +234,7 @@ void Foam::flowRateInletVelocityFvPatchVectorField::write(Ostream& os) const
     if (!volumetric_)
     {
         writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
-        os.writeKeyword("rhoInlet") << rhoInlet_ << token::END_STATEMENT << nl;
+        writeEntryIfDifferent<scalar>(os, "rhoInlet", -VGREAT, rhoInlet_);
     }
     writeEntry("value", os);
 }

src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.H

@@ -29,7 +29,7 @@ Description
     magnitude as an integral over its area.
 
     Either specify 'volumetricFlowRate' or 'massFlowRate' (requires additional
-    'rho' entry).
+    'rho' or 'rhoInlet' entry).
 
     Example of the boundary condition specification:
     \verbatim
@@ -44,9 +44,10 @@ Description
     inlet
     {
         type                flowRateInletVelocity;
-        volumetricFlowRate  0.2;  // mass flow rate [kg/s]
+        massFlowRate        0.2;  // mass flow rate [kg/s]
         rho                 rho;  // rho [m3/s or kg/s]
-        value               uniform (0 0 0); // placeholder
+        rhoInlet            1.0   // uniform rho if no rho field registered
+                                  // (e.g. at startup)
     }
     \endverbatim
 

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/T

@@ -20,6 +20,9 @@ internalField   uniform 265;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            fixedValue;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/U

@@ -20,6 +20,9 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            fixedValue;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/alphat

@@ -21,6 +21,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            alphatWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/epsilon

@@ -21,6 +21,9 @@ internalField   uniform 0.01;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            epsilonWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/k

@@ -21,6 +21,9 @@ internalField   uniform 0.1;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            kqRWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/kappat

@@ -21,6 +21,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            kappatJayatillekeWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/nut

@@ -21,6 +21,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            nutkWallFunction;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p

@@ -20,6 +20,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            calculated;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/0/p_rgh

@@ -20,6 +20,9 @@ internalField   uniform 0;
 
 boundaryField
 {
+    //- Set patchGroups for constraint patches
+    #include "${WM_PROJECT_DIR}/etc/caseDicts/setConstraintTypes"
+
     ground
     {
         type            fixedFluxPressure;

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary

@@ -1,63 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    maxY
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          400;
-        startFace       22800;
-    }
-    minX
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          400;
-        startFace       23200;
-    }
-    maxX
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          400;
-        startFace       23600;
-    }
-    minY
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          400;
-        startFace       24000;
-    }
-    ground
-    {
-        type            wall;
-        nFaces          400;
-        startFace       24400;
-    }
-    maxZ
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          400;
-        startFace       24800;
-    }
-)
-
-// ************************************************************************* //

tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/system/meshQualityDict

@@ -0,0 +1,64 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      meshQualityDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Maximum non-orthogonality allowed. Set to 180 to disable.
+maxNonOrtho 65;
+
+//- Max skewness allowed. Set to <0 to disable.
+maxBoundarySkewness 20;
+maxInternalSkewness 4;
+
+//- Max concaveness allowed. Is angle (in degrees) below which concavity
+//  is allowed. 0 is straight face, <0 would be convex face.
+//  Set to 180 to disable.
+maxConcave 80;
+
+//- Minimum pyramid volume. Is absolute volume of cell pyramid.
+//  Set to a sensible fraction of the smallest cell volume expected.
+//  Set to very negative number (e.g. -1E30) to disable.
+minVol 1e-13;
+
+//- Minimum quality of the tet formed by the face-centre
+//  and variable base point minimum decomposition triangles and
+//  the cell centre.  Set to very negative number (e.g. -1E30) to
+//  disable.
+//     <0 = inside out tet,
+//      0 = flat tet
+//      1 = regular tet
+minTetQuality 1e-30;
+
+//- Minimum face area. Set to <0 to disable.
+minArea -1;
+
+//- Minimum face twist. Set to <-1 to disable. dot product of face normal
+//- and face centre triangles normal
+minTwist 0.05;
+
+//- minimum normalised cell determinant
+//- 1 = hex, <= 0 = folded or flattened illegal cell
+minDeterminant 0.001;
+
+//- minFaceWeight (0 -> 0.5)
+minFaceWeight 0.05;
+
+//- minVolRatio (0 -> 1)
+minVolRatio 0.01;
+
+//must be >0 for Fluent compatibility
+minTriangleTwist -1;
+
+
+// ************************************************************************* //

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allrun

@@ -1,13 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-# create mesh
-runApplication blockMesh
-
-# run the solver
-runApplication `getApplication`
-
-# ----------------------------------------------------------------- end-of-file

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0.org/U

@@ -33,13 +33,13 @@ boundaryField
     {
         type            flowRateInletVelocity;
         massFlowRate    constant 0.00379;
-        value           uniform (0 14.68 0);
+        rhoInlet        1.0;    // fallback value for e.g. potentialFoam
     }
     inletSides
     {
         type            flowRateInletVelocity;
         massFlowRate  constant 0.00832;
-        value           uniform (0 17.79 0);
+        rhoInlet        1.0;    // fallback value for e.g. potentialFoam
     }
     outlet
     {

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/H2O

@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      H2O;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.01;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    walls
-    {
-        type            zeroGradient;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.0;
-    }
-    inletSides
-    {
-        type            fixedValue;
-        value           uniform 0.01;
-    }
-    inletCentral
-    {
-        type            fixedValue;
-        value           uniform 0.01;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/T

@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 1 0 0 0];
-
-internalField   uniform 473.0;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    walls
-    {
-        type            zeroGradient;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 473.0;
-    }
-    inletSides
-    {
-        type            fixedValue;
-        value           uniform 473.0;
-    }
-    inletCentral
-    {
-        type            fixedValue;
-        value           uniform 573.0;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/U

@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-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
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    inletCentral
-    {
-        type            flowRateInletVelocity;
-        massFlowRate    constant 0.00379;
-        value           uniform (0 14.68 0);
-    }
-    inletSides
-    {
-        type            flowRateInletVelocity;
-        massFlowRate    constant 0.00832;
-        value           uniform (0 17.79 0);
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-    }
-    walls
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/air

@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      air;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 0.99;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    walls
-    {
-        type            zeroGradient;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1.0;
-    }
-    inletSides
-    {
-        type            fixedValue;
-        value           uniform 0.99;
-    }
-    inletCentral
-    {
-        type            fixedValue;
-        value           uniform 0.99;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/alphat

@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      alphat;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -1 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    inletCentral
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    inletSides
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    outlet
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    walls
-    {
-        type            alphatWallFunction;
-        Prt             0.85;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/k

@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -2 0 0 0 0];
-
-internalField   uniform 3.75e-9;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    inletCentral
-    {
-        type            turbulentIntensityKineticEnergyInlet;
-        intensity       0.15;
-        value           uniform 3.75e-9;
-    }
-    inletSides
-    {
-        type            turbulentIntensityKineticEnergyInlet;
-        intensity       0.16;
-        value           uniform 3.75e-9;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 3.75e-9;
-    }
-    walls
-    {
-        type            compressible::kqRWallFunction;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/mut

@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      mut;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -1 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    inletCentral
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    inletSides
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    outlet
-    {
-        type            calculated;
-        value           uniform 0;
-    }
-    walls
-    {
-        type            mutkWallFunction;
-        Cmu             0.09;
-        kappa           0.41;
-        E               9.8;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/omega

@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      omega;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 -1 0 0 0 0];
-
-internalField   uniform 4.5e-3;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    inletCentral
-    {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
-        mixingLength    0.007;
-        k               k;
-        value           uniform 4.5e-3;
-    }
-    inletSides
-    {
-        type            compressible::turbulentMixingLengthFrequencyInlet;
-        mixingLength    0.007;
-        k               k;
-        value           uniform 4.5e-3;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 4.5e-3;
-    }
-    walls
-    {
-        type            compressible::omegaWallFunction;
-        Cmu             0.09;
-        kappa           0.41;
-        E               9.8;
-        value           uniform 0;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/0/p

@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 100000;
-
-boundaryField
-{
-    back
-    {
-        type            symmetryPlane;
-    }
-    front
-    {
-        type            symmetryPlane;
-    }
-    inletCentral
-    {
-        type            zeroGradient;
-    }
-    inletSides
-    {
-        type            zeroGradient;
-    }
-    outlet
-    {
-        type            fixedValue;
-        value           uniform 100000;
-    }
-    walls
-    {
-        type            zeroGradient;
-    }
-}
-
-
-// ************************************************************************* //

tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allclean

@@ -7,10 +7,6 @@ cd ${0%/*} || exit 1    # run from this directory
 # remove old time and post-processing folders
 rm -rf 0 *[1-9]* processor* postProcessing
 
-
-# copy 0.org to 0
-cp -r 0.org 0
-
 cleanCase
 
 # ----------------------------------------------------------------- end-of-file

tutorials/lagrangian/reactingParcelFoam/verticalChannel/Allrun

@@ -7,8 +7,11 @@ cd ${0%/*} || exit 1    # run from this directory
 # create mesh
 runApplication blockMesh
 
+cp -r 0.org 0
+
 # initialise with potentialFoam solution
 runApplication potentialFoam
+
 rm -f 0/phi
 
 # run the solver

tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/polyMesh/boundary

@@ -1,60 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    back
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          9340;
-        startFace       265900;
-    }
-    front
-    {
-        type            symmetryPlane;
-        inGroups        1(symmetryPlane);
-        nFaces          9340;
-        startFace       275240;
-    }
-    inletCentral
-    {
-        type            patch;
-        nFaces          100;
-        startFace       284580;
-    }
-    inletSides
-    {
-        type            patch;
-        nFaces          200;
-        startFace       284680;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          300;
-        startFace       284880;
-    }
-    walls
-    {
-        type            wall;
-        nFaces          9320;
-        startFace       285180;
-    }
-)
-
-// ************************************************************************* //