Merge commit 'OpenCFD/master' into olesenm

applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C

@@ -275,6 +275,12 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
         patchIndices[patchI] = patchIndex(bm[patchI]);
     }
 
+    // Temporary: update number of allowable patches. This should be
+    // determined at the top - before adding anything.
+    meshMod_.setNumPatches(patchNames_.size());
+
+
+
     const faceZoneMesh& fz = m.faceZones();
     labelList faceZoneIndices(fz.size());
 

applications/utilities/parallelProcessing/decomposePar/decomposeParDict

@@ -58,4 +58,15 @@ manualCoeffs
     dataFile    "decompositionData";
 }
 
+
+//// Is the case distributred
+//distributed     yes;
+//// Per slave (so nProcs-1 entries) the directory above the case.
+//roots           
+//(
+//    "/tmp"
+//    "/tmp"
+//);
+
+
 // ************************************************************************* //

tutorials/snappyHexMesh/iglooWithFridges/constant/dynamicMeshDict

-// The FOAM Project // File: motionProperties
-/*
-
--------------------------------------------------------------------------------
- =========         | dictionary
- \\      /         |
-  \\    /          | Name:   motionProperties
-   \\  /           | Family: FoamX configuration file
-    \\/            |
-    F ield         | FOAM version: 2.1
-    O peration     | Product of Nabla Ltd.
-    A and          |
-    M anipulation  | Email: Enquiries@Nabla.co.uk
--------------------------------------------------------------------------------
-*/
-// FoamX Case Dictionary.
-
-version             1.0;
-format              ascii;
-
-root                "/home/warhol/chris/foam/chris2.1/run/Test";
-case                "movingCone";
-instance            "constant";
-local               "";
-
-class               dictionary;
-form                dictionary;
-object              motionProperties;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//motionSolverLibs ("libfvMotionSolvers.so");
-solver laplacian;
-//solver componentLaplacian x;
-
-twoDMotion          no;
-
-diffusivity  uniform;
-
-//motionPlaneNormal   (0 0 1);
-//
-//movingSurface       yes;
-//
-//twoFluids           no;
-//
-//normalMotionDir     no;
-//
-//motionURF           1.0;
-//
-//boundaryCorrection  yes;
-
-// ************************************************************************* //

tutorials/snappyHexMesh/iglooWithFridges/constant/transportProperties

-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      transportProperties;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-nu              nu [0 2 -1 0 0 0 0] 0.01;
-
-// ************************************************************************* //

tutorials/snappyHexMesh/iglooWithFridges/system/decomposeParDict

-// The FOAM Project // File: decomposeParDict
-/*
--------------------------------------------------------------------------------
- =========         | dictionary
- \\      /         | 
-  \\    /          | Name:   decomposeParDict
-   \\  /           | Family: FoamX configuration file
-    \\/            | 
-    F ield         | FOAM version: 2.1
-    O peration     | Product of Nabla Ltd.
-    A and          | 
-    M anipulation  | Email: Enquiries@Nabla.co.uk
--------------------------------------------------------------------------------
-*/
-// FoamX Case Dictionary.
-
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
-    case            "cavity";
-    instance        "system";
-    local           "";
-
-    class           dictionary;
-    object          decomposeParDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-arguments       "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam" "cavity";
-
 numberOfSubdomains 6;
 
 method          hierarchical;

tutorials/snappyHexMesh/motorBike/constant/dynamicMeshDict

-// The FOAM Project // File: motionProperties
-/*
-
--------------------------------------------------------------------------------
- =========         | dictionary
- \\      /         |
-  \\    /          | Name:   motionProperties
-   \\  /           | Family: FoamX configuration file
-    \\/            |
-    F ield         | FOAM version: 2.1
-    O peration     | Product of Nabla Ltd.
-    A and          |
-    M anipulation  | Email: Enquiries@Nabla.co.uk
--------------------------------------------------------------------------------
-*/
-// FoamX Case Dictionary.
-
-version             1.0;
-format              ascii;
-
-root                "/home/warhol/chris/foam/chris2.1/run/Test";
-case                "movingCone";
-instance            "constant";
-local               "";
-
-class               dictionary;
-form                dictionary;
-object              motionProperties;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//motionSolverLibs ("libfvMotionSolvers.so");
-solver laplacian;
-//solver componentLaplacian x;
-
-twoDMotion          no;
-
-diffusivity  uniform;
-
-//motionPlaneNormal   (0 0 1);
-//
-//movingSurface       yes;
-//
-//twoFluids           no;
-//
-//normalMotionDir     no;
-//
-//motionURF           1.0;
-//
-//boundaryCorrection  yes;
-
-// ************************************************************************* //

tutorials/snappyHexMesh/motorBike/constant/transportProperties

-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      transportProperties;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-nu              nu [0 2 -1 0 0 0 0] 0.01;
-
-// ************************************************************************* //

tutorials/snappyHexMesh/motorBike/system/decomposeParDict

-// The FOAM Project // File: decomposeParDict
-/*
--------------------------------------------------------------------------------
- =========         | dictionary
- \\      /         | 
-  \\    /          | Name:   decomposeParDict
-   \\  /           | Family: FoamX configuration file
-    \\/            | 
-    F ield         | FOAM version: 2.1
-    O peration     | Product of Nabla Ltd.
-    A and          | 
-    M anipulation  | Email: Enquiries@Nabla.co.uk
--------------------------------------------------------------------------------
-*/
-// FoamX Case Dictionary.
-
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
 FoamFile
 {
-    version         2.0;
-    format          ascii;
-
-    root            "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
-    case            "cavity";
-    instance        "system";
-    local           "";
-
-    class           dictionary;
-    object          decomposeParDict;
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      decomposeParDict;
 }
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-arguments       "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam" "cavity";
-
 numberOfSubdomains 6;
 
 method          hierarchical;