Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

applications/Allwmake

@@ -10,7 +10,7 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
 
 set -x
 
-wmake all solvers
 wmake all utilities
+wmake all solvers
 
 # ----------------------------------------------------------------- end-of-file

applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H

@@ -11,7 +11,7 @@ forAll(patches, patchi)
 {
     const fvPatch& currPatch = patches[patchi];
 
-    if (isType<wallFvPatch>(currPatch))
+    if (isA<wallFvPatch>(currPatch))
     {
         const vectorField nf = currPatch.nf();
 

applications/test/fileName/fileNameTest.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,7 @@ int main()
         word name;
 
         fileName path(SubList<word>(wrdList, wrdList.size()-start, start));
-        fileName path2 = "." / path;
+        fileName path2 = "."/path;
 
         IOobject::fileNameComponents
         (

applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L

@@ -91,23 +91,20 @@ cspace                ","{space}
 
 alpha                 [_A-Za-z]
 digit                 [0-9]
-dec_digit             [0-9]
-octal_digit           [0-7]
-hex_digit             [0-9a-fA-F]
 
 identifier            {alpha}({alpha}|{digit})*
-integer               {dec_digit}+
+integer               {digit}+
-label                 [1-9]{dec_digit}*
+label                 [1-9]{digit}*
 
 exponent_part         [eE][-+]?{digit}+
 fractional_constant   [-+]?(({digit}*"."{digit}+)|({digit}+"."?))
 
-double                (({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))
+floatNum              (({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))
 
-x                     {double}
+x                     {floatNum}
-y                     {double}
+y                     {floatNum}
-z                     {double}
+z                     {floatNum}
-value                 {double}
+value                 {floatNum}
 
 node                  ^{space}"N"{cspace}
 element               ^{space}"EN"{cspace}

applications/utilities/mesh/conversion/foamToStarMesh/Make/options

@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/conversion/lnInclude
+    -I$(LIB_SRC)/conversion/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude
 
 EXE_LIBS = \
     -lconversion

applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L

@@ -95,24 +95,14 @@ int yyFlexLexer::yywrap()
 one_space             [ \t\f\r]
 space                 {one_space}*
 some_space            {one_space}+
-cspace                ","{space}
 spaceNl               ({space}|\n)*
 
 alpha                 [_[:alpha:]]
 digit                 [[:digit:]]
-dec_digit             [[:digit:]]
-octal_digit           [0-7]
-hex_digit             [[:xdigit:]]
 
-lbrac                      "("
+dotColonDash          [.:-]
-rbrac                      ")"
-quote                      \"
-dash                       "-"
-dotColonDash               [.:-]
 
-identifier            {alpha}({alpha}|{digit})*
+label                 [0-9]{digit}*
-integer               {dec_digit}+
-label                 [0-9]{dec_digit}*
 zeroLabel             {digit}*
 
 word                  ({alpha}|{digit}|{dotColonDash})*
@@ -120,14 +110,14 @@ word                  ({alpha}|{digit}|{dotColonDash})*
 exponent_part         [eE][-+]?{digit}+
 fractional_constant   [-+]?(({digit}*"."{digit}+)|({digit}+"."?))
 
-double                ((({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))|0)
+floatNum              ((({fractional_constant}{exponent_part}?)|({digit}+{exponent_part}))|0)
+
+x                     {floatNum}
+y                     {floatNum}
+z                     {floatNum}
 
-x                     {double}
-y                     {double}
-z                     {double}
-scalar                {double}
 labelListElement      {space}{zeroLabel}
-scalarListElement     {space}{double}
+scalarListElement     {space}{floatNum}
 labelList             ({labelListElement}+{space})
 scalarList            ({scalarListElement}+{space})
 

applications/utilities/mesh/conversion/polyDualMesh/polyDualMeshApp.C

@@ -358,9 +358,22 @@ int main(int argc, char *argv[])
     timeSelector::addOptions(true, false);
 
     argList::validArgs.append("feature angle[0-180]");
-    argList::addBoolOption("splitAllFaces");
+    argList::addBoolOption
-    argList::addBoolOption("concaveMultiCells");
+    (
-    argList::addBoolOption("doNotPreserveFaceZones");
+        "splitAllFaces",
+        "have multiple faces inbetween cells"
+    );
+    argList::addBoolOption
+    (
+        "concaveMultiCells",
+        "split cells on concave boundary edges into multiple cells"
+    );
+    argList::addBoolOption
+    (
+        "doNotPreserveFaceZones",
+        "disable the default behaviour of preserving faceZones by having"
+        " multiple faces inbetween cells"
+    );
 
 #   include "setRootCase.H"
 #   include "createTime.H"

applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C

@@ -884,7 +884,7 @@ void starMesh::createCoupleMatches()
                 << "newSlaveEdges: " << newSlaveEdges << endl;
 #           endif
 
-            edge startEdge;
+            edge startEdge(-1, -1);
 
             // Remember where the start edge was found:
             // 0 for not found

applications/utilities/mesh/conversion/star4ToFoam/Make/options

@@ -1,6 +1,7 @@
 EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/conversion/lnInclude
+    -I$(LIB_SRC)/conversion/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude
 
 EXE_LIBS = \
     -lconversion

applications/utilities/mesh/manipulation/setSet/Allwmake

@@ -1,15 +1,17 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
-READLINE=0
 if [ -f /usr/include/readline/readline.h ]
 then
     echo "Found readline/readline.h  --  enabling readline support."
-    READLINE=1
+    export READLINE=1
     export READLINELINK="-lreadline -lncurses"
-    break
+else
+    # no readline/readline.h  --  disabling readline support
+    export READLINE=0
+    unset READLINELINK
 fi
-export READLINE
+
 wmake
 
 # ----------------------------------------------------------------- end-of-file

applications/utilities/mesh/manipulation/setSet/Make/options

@@ -1,5 +1,7 @@
+/* NB: trailing zero after define improves robustness */
+
 EXE_INC = \
-    -DREADLINE=$(READLINE) \
+    -DREADLINE=$(READLINE)0 \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \

applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C

@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
         (
             databases[procI].findInstance
             (
-                regionDir / polyMesh::meshSubDir,
+                regionDir/polyMesh::meshSubDir,
                 "points"
             )
         );
@@ -469,10 +469,10 @@ int main(int argc, char *argv[])
                 "points",
                 databases[procI].findInstance
                 (
-                    regionDir / polyMesh::meshSubDir,
+                    regionDir/polyMesh::meshSubDir,
                     "points"
                 ),
-                regionDir / polyMesh::meshSubDir,
+                regionDir/polyMesh::meshSubDir,
                 databases[procI],
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE,

applications/utilities/parallelProcessing/redistributeMeshPar/Make/options

@@ -8,5 +8,4 @@ EXE_LIBS = \
     -lfiniteVolume \
     -ldecompositionMethods \
     -lmeshTools \
-    -ldynamicMesh \
+    -ldynamicMesh
-    -L$(FOAM_MPI_LIBBIN) -lparMetisDecompositionMethod

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/PV3FoamReader_SM.xml

@@ -82,6 +82,19 @@
       </Documentation>
     </IntVectorProperty>
 
+    <!-- Use VTK Polyhedron check-box -->
+    <IntVectorProperty
+      name="UseVTKPolyhedron"
+      command="SetUseVTKPolyhedron"
+      number_of_elements="1"
+      default_values="0"
+      animateable="0">
+      <BooleanDomain name="bool"/>
+      <Documentation>
+        Use vtkPolyhedron instead of decomposing polyhedra
+      </Documentation>
+    </IntVectorProperty>
+
     <!-- Include Sets check-box -->
     <IntVectorProperty
       name="UiIncludeSets"

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.cxx

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/pqPV3FoamReaderPanel.h

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2009 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.cxx

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -83,6 +83,7 @@ vtkPV3FoamReader::vtkPV3FoamReader()
 
     SkipZeroTime = 0;
     ExtrapolatePatches = 0;
+    UseVTKPolyhedron = 0;
     IncludeSets = 0;
     IncludeZones = 0;
     ShowPatchNames = 0;

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2008-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,6 +102,11 @@ public:
     vtkSetMacro(ExtrapolatePatches, int);
     vtkGetMacro(ExtrapolatePatches, int);
 
+    // Description:
+    // FOAM use vtkPolyhedron instead of decomposing polyhedra
+    vtkSetMacro(UseVTKPolyhedron, int);
+    vtkGetMacro(UseVTKPolyhedron, int);
+
     // Description:
     // FOAM read sets control
     virtual void SetIncludeSets(int);
@@ -217,6 +222,7 @@ private:
     int SkipZeroTime;
 
     int ExtrapolatePatches;
+    int UseVTKPolyhedron;
     int IncludeSets;
     int IncludeZones;
     int ShowPatchNames;

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMPoints.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkOpenFOAMTupleRemap.H

@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    vtkPV3Foam
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vtkOpenFOAMTupleRemap_H
+#define vtkOpenFOAMTupleRemap_H
+
+// OpenFOAM includes
+#include "StaticAssert.H"
+#include "Swap.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+inline void vtkOpenFOAMTupleRemap(float vec[]);
+
+
+// a symmTensor specialization to remap OpenFOAM -> ParaView naming order
+// Qt/Core/pqScalarBarRepresentation.cxx defines this order
+//     { "XX", "YY", "ZZ", "XY", "YZ", "XZ" }
+// in pqScalarBarRepresentation::getDefaultComponentLabel()
+// whereas OpenFOAM uses this order
+//     { XX, XY, XZ, YY, YZ, ZZ }
+//
+// for extra safety, assert that symmTensor indeed has 6 components
+StaticAssert(Foam::symmTensor::nComponents == 6);
+
+
+// Template specialization for symmTensor
+template<>
+inline void vtkOpenFOAMTupleRemap<Foam::symmTensor>(float vec[])
+{
+    Foam::Swap(vec[1], vec[3]);   // swap XY <-> YY
+    Foam::Swap(vec[2], vec[5]);   // swap XZ <-> ZZ
+}
+
+
+template<class Type>
+inline void vtkOpenFOAMTupleRemap(float vec[])
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamAddToSelection.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFaceField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,8 @@ InClass
 #include "vtkMultiBlockDataSet.h"
 #include "vtkPolyData.h"
 
+#include "vtkOpenFOAMTupleRemap.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -80,7 +82,7 @@ void Foam::vtkPV3Foam::convertFaceField
         {
             Type t = 0.5*(tf[faceOwner[faceNo]] + tf[faceNeigh[faceNo]]);
 
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
@@ -88,11 +90,12 @@ void Foam::vtkPV3Foam::convertFaceField
         else
         {
             const Type& t = tf[faceOwner[faceNo]];
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
         }
+        vtkOpenFOAMTupleRemap<Type>(vec);
 
         cellData->InsertTuple(faceI, vec);
     }
@@ -152,7 +155,7 @@ void Foam::vtkPV3Foam::convertFaceField
         {
             Type t = 0.5*(tf[faceOwner[faceNo]] + tf[faceNeigh[faceNo]]);
 
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
@@ -160,11 +163,12 @@ void Foam::vtkPV3Foam::convertFaceField
         else
         {
             const Type& t = tf[faceOwner[faceNo]];
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
         }
+        vtkOpenFOAMTupleRemap<Type>(vec);
 
         cellData->InsertTuple(faceI, vec);
         ++faceI;

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamLagrangianFields.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,6 +32,8 @@ InClass
 
 #include "Cloud.H"
 
+#include "vtkOpenFOAMTupleRemap.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -86,10 +88,11 @@ void Foam::vtkPV3Foam::convertLagrangianField
     forAll(tf, i)
     {
         const Type& t = tf[i];
-        for (direction d=0; d<nComp; d++)
+        for (direction d=0; d<nComp; ++d)
         {
             vec[d] = component(t, d);
         }
+        vtkOpenFOAMTupleRemap<Type>(vec);
 
         pointData->InsertTuple(i, vec);
     }

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshLagrangian.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshPatch.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshSet.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "vtkPV3Foam.H"
+#include "vtkPV3FoamReader.h"
 
 // Foam includes
 #include "fvMesh.H"
@@ -33,6 +34,7 @@ License
 
 // VTK includes
 #include "vtkCellArray.h"
+#include "vtkIdTypeArray.h"
 #include "vtkUnstructuredGrid.h"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -79,35 +81,40 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
     {
         Info<< "... scanning" << endl;
     }
-    forAll(cellShapes, cellI)
+
+    // count number of cells to decompose
+    if (!reader_->GetUseVTKPolyhedron())
     {
-        const cellModel& model = cellShapes[cellI].model();
+        forAll(cellShapes, cellI)
-
-        if
-        (
-            model != hex
-         && model != wedge
-         && model != prism
-         && model != pyr
-         && model != tet
-         && model != tetWedge
-        )
         {
-            const cell& cFaces = mesh.cells()[cellI];
+            const cellModel& model = cellShapes[cellI].model();
 
-            forAll(cFaces, cFaceI)
+            if
+            (
+                model != hex
+             && model != wedge
+             && model != prism
+             && model != pyr
+             && model != tet
+             && model != tetWedge
+            )
             {
-                const face& f = mesh.faces()[cFaces[cFaceI]];
+                const cell& cFaces = mesh.cells()[cellI];
 
-                label nFacePoints = f.size();
+                forAll(cFaces, cFaceI)
+                {
+                    const face& f = mesh.faces()[cFaces[cFaceI]];
 
-                label nQuads = (nFacePoints - 2)/2;
+                    label nFacePoints = f.size();
-                label nTris = (nFacePoints - 2)%2;
+
-                nAddCells += nQuads + nTris;
+                    label nQuads = (nFacePoints - 2)/2;
+                    label nTris = (nFacePoints - 2)%2;
+                    nAddCells += nQuads + nTris;
+                }
+
+                nAddCells--;
+                nAddPoints++;
             }
-
-            nAddCells--;
-            nAddPoints++;
         }
     }
 
@@ -155,7 +162,7 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
     // Set counters for additional points and additional cells
     label addPointI = 0, addCellI = 0;
 
-    // Create storage for points - needed for mapping from Foam to VTK
+    // Create storage for points - needed for mapping from OpenFOAM to VTK
     // data types - max 'order' = hex = 8 points
     vtkIdType nodeIds[8];
 
@@ -194,10 +201,15 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
         }
         else if (cellModel == prism)
         {
-            for (int j = 0; j < 6; j++)
+            // VTK has a different node order - their triangles point outwards!
-            {
+
-                nodeIds[j] = cellShape[j];
+            nodeIds[0] = cellShape[0];
-            }
+            nodeIds[1] = cellShape[2];
+            nodeIds[2] = cellShape[1];
+            nodeIds[3] = cellShape[3];
+            nodeIds[4] = cellShape[5];
+            nodeIds[5] = cellShape[4];
+
             vtkmesh->InsertNextCell
             (
                 VTK_WEDGE,
@@ -256,6 +268,80 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh
                 nodeIds
             );
         }
+        else if (reader_->GetUseVTKPolyhedron())
+        {
+            // Polyhedral cell - use VTK_POLYHEDRON
+            const labelList& cFaces = mesh.cells()[cellI];
+
+            vtkIdType nFaces = cFaces.size();
+            vtkIdType nodeCount = 0;
+            vtkIdType nLabels = nFaces;
+
+            // count size for face stream
+            forAll(cFaces, cFaceI)
+            {
+                const face& f = mesh.faces()[cFaces[cFaceI]];
+                nLabels += f.size();
+            }
+
+            // unique node ids - approximately equal to the number of point ids
+            DynamicList<vtkIdType> uniqueNodeIds(nLabels-nFaces);
+
+            // zero-based index into uniqueNodeIds
+            DynamicList<vtkIdType> faceLabels(nLabels);
+
+            // localized point id within the cell
+            Map<label> mapLocalId(2*nLabels);
+
+            // establish the unique point ids,
+            // record the local mapping ids,
+            // create new face list
+            forAll(cFaces, cFaceI)
+            {
+                const face& f = mesh.faces()[cFaces[cFaceI]];
+                const label nFacePoints = f.size();
+
+                // number of labels for this face
+                faceLabels.append(nFacePoints);
+
+                forAll(f, fp)
+                {
+                    const label nodeId = f[fp];
+
+                    if (mapLocalId.insert(nodeId, nodeCount))
+                    {
+                        // insertion was successful (node Id was unique)
+                        uniqueNodeIds.append(nodeId);
+                        // map orig vertex id -> localized point label
+                        faceLabels.append(nodeCount);
+                        ++nodeCount;
+                    }
+                    else
+                    {
+                        // map orig vertex id -> localized point label
+                        faceLabels.append(mapLocalId[nodeId]);
+                    }
+                }
+            }
+
+#ifdef HAS_VTK_POLYHEDRON
+            vtkmesh->InsertNextCell
+            (
+                VTK_POLYHEDRON,
+                nodeCount,
+                uniqueNodeIds.data(),
+                faceCount,
+                faceLabels.data()
+            );
+#else
+            vtkmesh->InsertNextCell
+            (
+                VTK_CONVEX_POINT_SET,
+                nodeCount,
+                uniqueNodeIds.data()
+            );
+#endif
+        }
         else
         {
             // Polyhedral cell. Decompose into tets + prisms.

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPatchField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,6 +37,8 @@ InClass
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
+#include "vtkOpenFOAMTupleRemap.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -61,10 +63,12 @@ void Foam::vtkPV3Foam::convertPatchField
     forAll(ptf, i)
     {
         const Type& t = ptf[i];
-        for (direction d=0; d<nComp; d++)
+        for (direction d=0; d<nComp; ++d)
         {
             vec[d] = component(t, d);
         }
+        vtkOpenFOAMTupleRemap<Type>(vec);
+
         cellData->InsertTuple(i, vec);
     }
 
@@ -101,10 +105,11 @@ void Foam::vtkPV3Foam::convertPatchPointField
     forAll(pptf, i)
     {
         const Type& t = pptf[i];
-        for (direction d=0; d<nComp; d++)
+        for (direction d=0; d<nComp; ++d)
         {
             vec[d] = component(t, d);
         }
+        vtkOpenFOAMTupleRemap<Type>(vec);
 
         pointData->InsertTuple(i, vec);
     }

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -33,6 +33,8 @@ InClass
 // Foam includes
 #include "interpolatePointToCell.H"
 
+#include "vtkOpenFOAMTupleRemap.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -210,10 +212,12 @@ void Foam::vtkPV3Foam::convertPointField
         forAll(pointMap, i)
         {
             const Type& t = ptf[pointMap[i]];
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
+            vtkOpenFOAMTupleRemap<Type>(vec);
+
             pointData->InsertTuple(i, vec);
         }
     }
@@ -222,10 +226,12 @@ void Foam::vtkPV3Foam::convertPointField
         forAll(ptf, i)
         {
             const Type& t = ptf[i];
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
+            vtkOpenFOAMTupleRemap<Type>(vec);
+
             pointData->InsertTuple(i, vec);
         }
     }
@@ -238,10 +244,12 @@ void Foam::vtkPV3Foam::convertPointField
         forAll(addPointCellLabels, apI)
         {
             const Type& t = tf[addPointCellLabels[apI]];
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
+            vtkOpenFOAMTupleRemap<Type>(vec);
+
             pointData->InsertTuple(i++, vec);
         }
     }
@@ -250,10 +258,12 @@ void Foam::vtkPV3Foam::convertPointField
         forAll(addPointCellLabels, apI)
         {
             Type t = interpolatePointToCell(ptf, addPointCellLabels[apI]);
-            for (direction d=0; d<nComp; d++)
+            for (direction d=0; d<nComp; ++d)
             {
                 vec[d] = component(t, d);
             }
+            vtkOpenFOAMTupleRemap<Type>(vec);
+
             pointData->InsertTuple(i++, vec);
         }
     }

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfoFields.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamVolFields.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,6 +39,8 @@ InClass
 #include "vtkPV3FoamFaceField.H"
 #include "vtkPV3FoamPatchField.H"
 
+#include "vtkOpenFOAMTupleRemap.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -350,10 +352,12 @@ void Foam::vtkPV3Foam::convertVolField
     forAll(superCells, i)
     {
         const Type& t = tf[superCells[i]];
-        for (direction d=0; d<nComp; d++)
+        for (direction d=0; d<nComp; ++d)
         {
             vec[d] = component(t, d);
         }
+        vtkOpenFOAMTupleRemap<Type>(vec);
+
         celldata->InsertTuple(i, vec);
     }
 

bin/foamClearPolyMesh

@@ -114,6 +114,7 @@ fi
 
 #
 # remove files (mesh itself, modifiers, snappyHexMesh ones) and subdirectories
+# also remove .gz versions of the same files
 #
 echo "Clearing ${caseDir:-.}/$meshDir" 1>&2
 
@@ -134,25 +135,9 @@ for i in \
     pointLevel \
     refinementHistory \
     surfaceIndex \
-    points.gz \
-    faces.gz \
-    owner.gz \
-    neighbour.gz \
-    cells.gz \
-    boundary.gz \
-    pointZones.gz \
-    faceZones.gz \
-    cellZones.gz \
-    meshModifiers.gz \
-    parallelData.gz \
-    sets.gz \
-    cellLevel.gz \
-    pointLevel.gz \
-    refinementHistory.gz \
-    surfaceIndex.gz \
 ;
 do
-    rm -rf $meshDir/$i
+    rm -rf $meshDir/$i $meshDir/$i.gz
 done
 
 #------------------------------------------------------------------------------

bin/paraFoam

@@ -44,6 +44,7 @@ options:
   -case <dir>       specify alternative case directory, default is the cwd
   -region <name>    specify alternative mesh region
   -touch            only create the file  (eg, .blockMesh, .OpenFOAM, etc)
+  -touchAll         create .blockMesh, .OpenFOAM files (and for all regions)
   -help             print the usage
 
 * start paraview $ParaView_VERSION with the OpenFOAM libraries
@@ -52,7 +53,7 @@ USAGE
     exit 1
 }
 
-unset regionName touchOnly
+unset regionName touchOpt
 
 # reader extension
 extension=OpenFOAM
@@ -83,7 +84,11 @@ do
         shift 2
         ;;
     -touch)
-        touchOnly=true
+        touchOpt=true
+        shift
+        ;;
+    -touchAll)
+        touchOpt=all
         shift
         ;;
     *)
@@ -103,12 +108,35 @@ then
     fvControls="$fvControls/$regionName"
 fi
 
-if [ -n "$touchOnly" ]
+case "${touchOpt:-false}" in
-then
+all)
+    extension=OpenFOAM
+    if [ -f constant/polyMesh/blockMeshDict ]
+    then
+        touch "$caseName.blockMesh"
+        echo "created '$caseName.blockMesh'"
+    fi
+    touch "$caseName.$extension"
+    echo "created '$caseName.$extension'"
+    # discover probable regions
+    for region in constant/*
+    do
+        if [ -d $region -a -d $region/polyMesh ]
+        then
+            regionName=${region##*/}
+            touch "$caseName{$regionName}.$extension"
+            echo "created '$caseName{$regionName}.$extension'"
+        fi
+    done
+    exit 0
+    ;;
+true)
     touch "$caseFile"
     echo "created '$caseFile'"
     exit 0
-fi
+    ;;
+esac
+
 
 # parent directory for normal or parallel results
 case "$caseName" in

etc/aliases.csh

@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -56,6 +56,11 @@ alias app 'cd $FOAM_APP'
 alias util 'cd $FOAM_UTILITIES'
 alias sol 'cd $FOAM_SOLVERS'
 alias tut 'cd $FOAM_TUTORIALS'
+
+alias foamApps 'cd $FOAM_APP'
+alias foamSol 'cd $FOAM_SOLVERS'
+alias foamTuts 'cd $FOAM_TUTORIALS'
+alias foamUtils 'cd $FOAM_UTILITIES'
 alias foam3rdParty 'cd $WM_THIRD_PARTY_DIR'
 
 # -----------------------------------------------------------------------------

etc/aliases.sh

@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -56,6 +56,11 @@ alias app='cd $FOAM_APP'
 alias util='cd $FOAM_UTILITIES'
 alias sol='cd $FOAM_SOLVERS'
 alias tut='cd $FOAM_TUTORIALS'
+
+alias foamApps='cd $FOAM_APP'
+alias foamSol='cd $FOAM_SOLVERS'
+alias foamTuts='cd $FOAM_TUTORIALS'
+alias foamUtils='cd $FOAM_UTILITIES'
 alias foam3rdParty='cd $WM_THIRD_PARTY_DIR'
 
 # -----------------------------------------------------------------------------

etc/apps/ensight/bashrc

@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -26,7 +26,7 @@
 #     ensight/bashrc
 #
 # Description
-#     Setup file for Ensight 8.?
+#     Setup file for Ensight
 #     Sourced from OpenFOAM-*/etc/bashrc
 #
 #------------------------------------------------------------------------------
@@ -40,7 +40,7 @@ fi
 if [ -r $CEI_HOME ]
 then
 
-    # special treatment for 32bit FOAM and 64bit Ensight
+    # special treatment for 32bit OpenFOAM and 64bit Ensight
     if [ "$WM_ARCH" = linux -a `uname -m` = x86_64 ]
     then
         export CEI_ARCH=linux_2.6_32
@@ -52,8 +52,8 @@ then
         export PATH=$CEI_HOME/bin:$PATH
     fi
 
-    export ENSIGHT8_INPUT=dummy
+    export ENSIGHT9_INPUT=dummy
-    export ENSIGHT8_READER=$FOAM_LIBBIN
+    export ENSIGHT9_READER=$FOAM_LIBBIN
 else
     unset CEI_HOME
 fi

etc/apps/ensight/cshrc

@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -26,7 +26,7 @@
 #     ensight/cshrc
 #
 # Description
-#     Setup file for Ensight 8.?
+#     Setup file for Ensight
 #     Sourced from OpenFOAM-*/etc/cshrc
 #
 #------------------------------------------------------------------------------
@@ -38,15 +38,16 @@ endif
 
 if ( -r $CEI_HOME ) then
 
-    # special treatment for 32bit FOAM and 64bit Ensight
+    # special treatment for 32bit OpenFOAM and 64bit Ensight
-    if ($WM_ARCH == linux) then
+    if ($WM_ARCH == linux && `uname -m` == x86_64) then
-        setenv CEI_ARCH linux_linux_2.6_32
+       setenv CEI_ARCH linux_2.6_32
     endif
 
-    set path=($path $CEI_HOME/bin)
+    # add to path
+    set path=($CEI_HOME/bin $path)
 
-    setenv ENSIGHT8_INPUT dummy
+    setenv ENSIGHT9_INPUT dummy
-    setenv ENSIGHT8_READER $FOAM_LIBBIN
+    setenv ENSIGHT9_READER $FOAM_LIBBIN
 else
     unsetenv CEI_HOME
 endif

etc/settings.csh

@@ -147,6 +147,30 @@ case OPENMPI:
     unset mpi_version
     breaksw
 
+case SYSTEMOPENMPI:
+
+    # This uses the installed openmpi. It needs mpicc installed!
+
+    set mpi_version=openmpi-system
+
+    # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+    setenv PINC `mpicc --showme:compile` 
+    setenv PLIBS `mpicc --showme:link`
+    set libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    if ($?FOAM_VERBOSE && $?prompt) then
+        echo "Using system installed MPI:"
+        echo "    compile flags : $PINC"
+        echo "    link flags    : $PLIBS"
+        echo "    libmpi dir    : $libDir"
+    endif
+
+    _foamAddLib $libDir
+
+    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/$mpi_version
+    unset mpi_version libDir
+    breaksw
+
 case MPICH:
     set mpi_version=mpich2-1.1.1p1
     setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version

etc/settings.sh

@@ -183,6 +183,28 @@ OPENMPI)
     unset mpi_version
     ;;
 
+SYSTEMOPENMPI)
+    mpi_version=openmpi-system
+
+    # Set compilation flags here instead of in wmake/rules/../mplibSYSTEMOPENMPI
+    export PINC=`mpicc --showme:compile` 
+    export PLIBS=`mpicc --showme:link`
+    libDir=`echo "$PLIBS" | sed -e 's/.*-L\([^ ]*\).*/\1/'`
+
+    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    then
+        echo "Using system installed MPI:"
+        echo "    compile flags : $PINC"
+        echo "    link flags    : $PLIBS"
+        echo "    libmpi dir    : $libDir"
+    fi
+
+    _foamAddLib $libDir
+
+    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/$mpi_version
+    unset mpi_version libDir
+    ;;
+
 MPICH)
     mpi_version=mpich2-1.1.1p1
     export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version

src/Allwmake

@@ -27,14 +27,18 @@ wmake libso edgeMesh
 wmake libso surfMesh
 wmake libso triSurface
 
-# Decomposition methods needed by meshTools
+# Decomposition methods needed by dummyThirdParty
-wmake libso parallel/decompositionMethods
+parallel/AllwmakeLnInclude
-wmake libso parallel/metisDecomp
+# dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
+dummyThirdParty/Allwmake
 
 wmake libso meshTools
 wmake libso finiteVolume
 wmake libso genericPatchFields
 
+# Build the proper scotchDecomp, metisDecomp etc.
+parallel/Allwmake
+
 wmake libso sampling
 
 wmake libso dynamicMesh

src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C

@@ -466,40 +466,6 @@ void Foam::FaceCellWave<Type>::transform
 }
 
 
-// Send face info to neighbour.
-template <class Type>
-void Foam::FaceCellWave<Type>::sendPatchInfo
-(
-    const label neighbour,
-    const label nFaces,
-    const labelList& faceLabels,
-    const List<Type>& faceInfo
-) const
-{
-    OPstream toNeighbour(Pstream::blocking, neighbour);
-
-    writeFaces(nFaces, faceLabels, faceInfo, toNeighbour);
-}
-
-
-// Receive face info from neighbour
-template <class Type>
-Foam::label Foam::FaceCellWave<Type>::receivePatchInfo
-(
-    const label neighbour,
-    labelList& faceLabels,
-    List<Type>& faceInfo
-) const
-{
-    IPstream fromNeighbour(Pstream::blocking, neighbour);
-
-    label nFaces = 0;
-    readFaces(nFaces, faceLabels, faceInfo, fromNeighbour);
-
-    return nFaces;
-}
-
-
 // Offset mesh face. Used for transferring from one cyclic half to the other.
 template <class Type>
 void Foam::FaceCellWave<Type>::offset
@@ -523,6 +489,8 @@ void Foam::FaceCellWave<Type>::handleProcPatches()
 {
     // Send all
 
+    PstreamBuffers pBufs(Pstream::nonBlocking);
+
     forAll(mesh_.boundaryMesh(), patchI)
     {
         const polyPatch& patch = mesh_.boundaryMesh()[patchI];
@@ -564,16 +532,13 @@ void Foam::FaceCellWave<Type>::handleProcPatches()
                     << endl;
             }
 
-            sendPatchInfo
+            UOPstream toNeighbour(procPatch.neighbProcNo(), pBufs);
-            (
+            writeFaces(nSendFaces, sendFaces, sendFacesInfo, toNeighbour);
-                procPatch.neighbProcNo(),
-                nSendFaces,
-                sendFaces,
-                sendFacesInfo
-            );
         }
     }
 
+    pBufs.finishedSends();
+
     // Receive all
 
     forAll(mesh_.boundaryMesh(), patchI)
@@ -586,16 +551,20 @@ void Foam::FaceCellWave<Type>::handleProcPatches()
                 refCast<const processorPolyPatch>(patch);
 
             // Allocate buffers
-            label nReceiveFaces;
+            label nReceiveFaces = 0;
             labelList receiveFaces(patch.size());
             List<Type> receiveFacesInfo(patch.size());
 
-            nReceiveFaces = receivePatchInfo
+            {
-            (
+                UIPstream fromNeighbour(procPatch.neighbProcNo(), pBufs);
-                procPatch.neighbProcNo(),
+                readFaces
-                receiveFaces,
+                (
-                receiveFacesInfo
+                    nReceiveFaces,
-            );
+                    receiveFaces,
+                    receiveFacesInfo,
+                    fromNeighbour
+                );
+            }
 
             if (debug)
             {

src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H

@@ -225,23 +225,6 @@ class FaceCellWave
                 List<Type>& faceInfo
             ) const;
 
-            //- Send info to neighbour
-            void sendPatchInfo
-            (
-                const label neighbour,
-                const label nFaces,
-                const labelList&,
-                const List<Type>&
-            ) const;
-
-            //- Receive info from neighbour. Returns number of faces received.
-            label receivePatchInfo
-            (
-                const label neighbour,
-                labelList&,
-                List<Type>&
-            ) const;
-
             //- Offset face labels by constant value
             static void offset
             (

src/OpenFOAM/db/IOstreams/Pstreams/IPstream.C

@@ -38,7 +38,8 @@ Foam::IPstream::IPstream
 )
 :
     Pstream(commsType, bufSize),
-    UIPstream(commsType, fromProcNo, buf_)
+    UIPstream(commsType, fromProcNo, buf_, externalBufPosition_),
+    externalBufPosition_(0)
 {}
 
 

src/OpenFOAM/db/IOstreams/Pstreams/IPstream.H

@@ -55,6 +55,9 @@ class IPstream
     public UIPstream
 {
 
+    //- Receive index
+    label externalBufPosition_;
+
 public:
 
     // Constructors

src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.C

@@ -51,10 +51,31 @@ Foam::PstreamBuffers::PstreamBuffers
     version_(version),
     sendBuf_(UPstream::nProcs()),
     recvBuf_(UPstream::nProcs()),
+    recvBufPos_(UPstream::nProcs(),  0),
     finishedSendsCalled_(false)
 {}
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::PstreamBuffers::~PstreamBuffers()
+{
+    // Check that all data has been consumed.
+    forAll(recvBufPos_, procI)
+    {
+        if (recvBufPos_[procI] < recvBuf_[procI].size())
+        {
+            FatalErrorIn("PstreamBuffers::~PstreamBuffers()")
+                << "Message from processor " << procI
+                << " not fully consumed. messageSize:" << recvBuf_[procI].size()
+                << " bytes of which only " << recvBufPos_[procI]
+                << " consumed."
+                << Foam::abort(FatalError);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void Foam::PstreamBuffers::finishedSends(const bool block)

src/OpenFOAM/db/IOstreams/Pstreams/PstreamBuffers.H

@@ -106,6 +106,9 @@ class PstreamBuffers
         //- receive buffer
         List<DynamicList<char> > recvBuf_;
 
+        //- read position in recvBuf_
+        labelList recvBufPos_;
+
         bool finishedSendsCalled_;
 
     // Private member functions
@@ -129,6 +132,10 @@ public:
             IOstream::versionNumber version=IOstream::currentVersion
         );
 
+    // Destructor
+
+        ~PstreamBuffers();
+
 
     // Member functions
 

src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.C

@@ -77,20 +77,6 @@ inline void Foam::UIPstream::readFromBuffer
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::UIPstream::~UIPstream()
-{
-    if (externalBufPosition_ < messageSize_)
-    {
-        FatalErrorIn("UIPstream::~UIPstream()")
-            << "Message not fully consumed. messageSize:" << messageSize_
-            << " bytes of which only " << externalBufPosition_
-            << " consumed." << Foam::abort(FatalError);
-    }
-}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 Foam::Istream& Foam::UIPstream::read(token& t)

src/OpenFOAM/db/IOstreams/Pstreams/UIPstream.H

@@ -63,7 +63,7 @@ class UIPstream
 
         DynamicList<char>& externalBuf_;
 
-        label externalBufPosition_;
+        label& externalBufPosition_;
 
         const int tag_;
 
@@ -94,6 +94,7 @@ public:
             const commsTypes commsType,
             const int fromProcNo,
             DynamicList<char>& externalBuf,
+            label& externalBufPosition,
             const int tag = UPstream::msgType(),
             streamFormat format=BINARY,
             versionNumber version=currentVersion
@@ -103,11 +104,6 @@ public:
         UIPstream(const int fromProcNo, PstreamBuffers&);
 
 
-    // Destructor
-
-        ~UIPstream();
-
-
     // Member functions
 
         // Inquiry

src/OpenFOAM/global/foamDoc.H

@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+@mainpage OpenFOAM®: open source CFD
+
+@section about About OpenFOAM
+
+    OpenFOAM is a free, open source CFD software package produced by
+    a commercial company,
+    <a href="http://www.openfoam.com/about">OpenCFD Ltd</a>.
+    It has a
+    large user base across most areas of engineering and science,
+    from both commercial and academic organisations.  OpenFOAM has an
+    extensive range of features to solve anything from complex fluid
+    flows involving chemical reactions, turbulence and heat transfer,
+    to solid dynamics and electromagnetics.
+    <a href="http://www.openfoam.com/features">More ...</a>
+
+@section users Our commitment to the users
+
+    OpenFOAM comes with full commercial support from OpenCFD, including
+    <a href="http://www.openfoam.com/support/software.php">software support</a>,
+    <a href="http://www.openfoam.com/support/development.php">contracted developments</a> 
+    and a programme of <a href="http://www.openfoam.com/training">training courses</a>.
+    These activities fund the development, maintenance and release of
+    OpenFOAM to make it an extremely viable commercial open source product.
+
+@section opensource Our commitment to open source
+
+   OpenCFD is committed to open source software, continually developing and
+   maintaining OpenFOAM under the
+   <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public Licence</a>.
+   OpenFOAM will <strong>always</strong> be free of charge and open source.
+   In addition, we endeavour to support other viable open source initiatives
+   that will benefit science and engineering.
+
+\*---------------------------------------------------------------------------*/

src/OpenFOAM/global/foamVersion.H

@@ -44,40 +44,6 @@ Description
 SourceFiles
     global.Cver
 
-
-@mainpage OpenFOAM®: open source CFD
-
-@section about About OpenFOAM
-
-    OpenFOAM is a free, open source CFD software package produced by
-    a commercial company,
-    <a href="http://www.openfoam.com/about">OpenCFD Ltd</a>.
-    It has a
-    large user base across most areas of engineering and science,
-    from both commercial and academic organisations.  OpenFOAM has an
-    extensive range of features to solve anything from complex fluid
-    flows involving chemical reactions, turbulence and heat transfer,
-    to solid dynamics and electromagnetics.
-    <a href="http://www.openfoam.com/features">More ...</a>
-
-@section users Our commitment to the users
-
-    OpenFOAM comes with full commercial support from OpenCFD, including
-    <a href="http://www.openfoam.com/support/software.php">software support</a>,
-    <a href="http://www.openfoam.com/support/development.php">contracted developments</a> and
-    a programme of <a href="http://www.openfoam.com/training">training courses</a>.
-    These activities fund the development, maintenance and release of
-    OpenFOAM to make it an extremely viable commercial open source product.
-
-@section opensource Our commitment to open source
-
-   OpenCFD is committed to open source software, continually developing and
-   maintaining OpenFOAM under the
-   <a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public Licence</a>.
-   OpenFOAM will <strong>always</strong> be free of charge and open source.
-   In addition, we endeavour to support other viable open source initiatives
-   that will benefit science and engineering.
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef foamVersion_H

src/OpenFOAM/include/addOverwriteOption.H

@@ -2,7 +2,7 @@
 // addOverwriteOption.H
 // ~~~~~~~~~~~~~~~~~~~~
 
-    Foam::argList::addOption
+    Foam::argList::addBoolOption
     (
         "overwrite",
         "overwrite existing mesh/results files"

src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C

@@ -57,7 +57,6 @@ void Foam::cyclicPointPatch::calcGeometry(PstreamBuffers&)
 {
     const edgeList& cp = cyclicPolyPatch_.coupledPoints();
     const labelList& mp = cyclicPolyPatch_.meshPoints();
-    const pointField& points = cyclicPolyPatch_.points();
 
     DynamicList<label> separated;
     forAll(cp, i)

src/Pstream/dummy/UIPread.C

@@ -36,6 +36,7 @@ Foam::UIPstream::UIPstream
     const commsTypes commsType,
     const int fromProcNo,
     DynamicList<char>& externalBuf,
+    label& externalBufPosition,
     const int tag,
     streamFormat format,
     versionNumber version
@@ -45,7 +46,7 @@ Foam::UIPstream::UIPstream
     Istream(format, version),
     fromProcNo_(fromProcNo),
     externalBuf_(externalBuf),
-    externalBufPosition_(0),
+    externalBufPosition_(externalBufPosition),
     tag_(tag),
     messageSize_(0)
 {
@@ -56,6 +57,7 @@ Foam::UIPstream::UIPstream
             "const commsTypes,"
             "const int fromProcNo,"
             "DynamicList<char>&,"
+            "label&,"
             "const int tag,"
             "streamFormat, versionNumber"
         ")"

src/Pstream/mpi/UIPread.C

@@ -40,6 +40,7 @@ Foam::UIPstream::UIPstream
     const commsTypes commsType,
     const int fromProcNo,
     DynamicList<char>& externalBuf,
+    label& externalBufPosition,
     const int tag,
     streamFormat format,
     versionNumber version
@@ -49,7 +50,7 @@ Foam::UIPstream::UIPstream
     Istream(format, version),
     fromProcNo_(fromProcNo),
     externalBuf_(externalBuf),
-    externalBufPosition_(0),
+    externalBufPosition_(externalBufPosition),
     tag_(tag),
     messageSize_(0)
 {
@@ -122,7 +123,7 @@ Foam::UIPstream::UIPstream(const int fromProcNo, PstreamBuffers& buffers)
     Istream(buffers.format_, buffers.version_),
     fromProcNo_(fromProcNo),
     externalBuf_(buffers.recvBuf_[fromProcNo]),
-    externalBufPosition_(0),
+    externalBufPosition_(buffers.recvBufPos_[fromProcNo]),
     tag_(buffers.tag_),
     messageSize_(0)
 {

src/Pstream/mpi/UOPwrite.C

@@ -45,7 +45,7 @@ bool Foam::UOPstream::write
 {
     if (debug)
     {
-        Pout<< "UIPstream::write : starting write to:" << toProcNo
+        Pout<< "UOPstream::write : starting write to:" << toProcNo
             << " tag:" << tag << " size:" << label(bufSize)
             << " commsType:" << UPstream::commsTypeNames[commsType]
             << Foam::endl;
@@ -67,7 +67,7 @@ bool Foam::UOPstream::write
 
         if (debug)
         {
-            Pout<< "UIPstream::write : finished write to:" << toProcNo
+            Pout<< "UOPstream::write : finished write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
                 << Foam::endl;
@@ -87,7 +87,7 @@ bool Foam::UOPstream::write
 
         if (debug)
         {
-            Pout<< "UIPstream::write : finished write to:" << toProcNo
+            Pout<< "UOPstream::write : finished write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
                 << Foam::endl;
@@ -110,7 +110,7 @@ bool Foam::UOPstream::write
 
         if (debug)
         {
-            Pout<< "UIPstream::write : started write to:" << toProcNo
+            Pout<< "UOPstream::write : started write to:" << toProcNo
                 << " tag:" << tag << " size:" << label(bufSize)
                 << " commsType:" << UPstream::commsTypeNames[commsType]
                 << " request:" << PstreamGlobals::outstandingRequests_.size()

src/conversion/Make/options

@@ -1,7 +1,9 @@
 EXE_INC = \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
+    -lfileFormats \
     -lfiniteVolume \
     -lmeshTools

src/conversion/ensight/file/ensightFile.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/file/ensightFile.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/file/ensightGeoFile.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/file/ensightGeoFile.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/part/ensightPart.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/part/ensightPart.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -150,7 +150,7 @@ protected:
         virtual void writeConnectivity
         (
             ensightGeoFile& os,
-            const string& key,
+            const word& key,
             const labelList& idList,
             const labelList& pointMap
         ) const

src/conversion/ensight/part/ensightPartCells.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -345,7 +345,7 @@ Foam::ensightPart::localPoints Foam::ensightPartCells::calcLocalPoints() const
 void Foam::ensightPartCells::writeConnectivity
 (
     ensightGeoFile& os,
-    const string& key,
+    const word& key,
     const labelList& idList,
     const labelList& pointMap
 ) const
@@ -357,7 +357,7 @@ void Foam::ensightPartCells::writeConnectivity
     const polyMesh& mesh = *meshPtr_;
 
     // write polyhedral
-    if (word(key) == "nfaced")
+    if (key == "nfaced")
     {
         const faceList& meshFaces = mesh.faces();
 

src/conversion/ensight/part/ensightPartCells.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ class ensightPartCells
         virtual void writeConnectivity
         (
             ensightGeoFile& os,
-            const string& key,
+            const word& key,
             const labelList& idList,
             const labelList& pointMap
         ) const;

src/conversion/ensight/part/ensightPartFaces.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -206,7 +206,7 @@ Foam::ensightPart::localPoints Foam::ensightPartFaces::calcLocalPoints() const
 void Foam::ensightPartFaces::writeConnectivity
 (
     ensightGeoFile& os,
-    const string& key,
+    const word& key,
     const labelList& idList,
     const labelList& pointMap
 ) const
@@ -218,7 +218,7 @@ void Foam::ensightPartFaces::writeConnectivity
     const faceList& meshFaces = meshPtr_->faces();
 
     // write (polygon) face sizes
-    if (word(key) == "nsided")
+    if (key == "nsided")
     {
         // write the number of points per face
         forAll(idList, i)

src/conversion/ensight/part/ensightPartFaces.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ class ensightPartFaces
         virtual void writeConnectivity
         (
             ensightGeoFile& os,
-            const string& key,
+            const word& key,
             const labelList& idList,
             const labelList& pointMap
         ) const;

src/conversion/ensight/part/ensightPartI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/part/ensightPartIO.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/part/ensightParts.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/part/ensightParts.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/ensight/part/ensightPartsI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshReader/calcPointCells.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshReader/createPolyBoundary.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshReader/createPolyCells.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshReader/meshReader.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshReader/meshReader.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshReader/meshReaderAux.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshReader/starcd/STARCDMeshReader.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,7 +237,7 @@ Body:
 
 For primitive cell shapes, the number of vertices will never exceed 8 (hexa)
 and corresponds to <nLabels>.
-For polyhedral, <nLabels> includess an index table comprising beg/end pairs
+For polyhedral, <nLabels> includes an index table comprising beg/end pairs
 for each cell face.
 
 Strictly speaking, we only need the cellModeller for adding boundaries.

src/conversion/meshReader/starcd/STARCDMeshReader.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshTables/boundaryRegion.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshTables/boundaryRegion.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshTables/cellTable.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshTables/cellTable.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshWriter/meshWriter.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/meshWriter/starcd/STARCDMeshWriter.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/polyDualMesh/polyDualMesh.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/conversion/polyDualMesh/polyDualMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

src/dummyThirdParty/Allwmake

@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake libso scotchDecomp
+wmake libso metisDecomp
+wmake libso parMetisDecomp
+wmake libso MGridGen
+
+
+# ----------------------------------------------------------------- end-of-file

src/dummyThirdParty/MGridGen/Make/files

@@ -0,0 +1,3 @@
+dummyMGridGen.C
+
+LIB = $(FOAM_LIBBIN)/dummy/libMGridGen

src/dummyThirdParty/MGridGen/Make/options

@@ -0,0 +1,3 @@
+EXE_INC =
+
+EXE_LIBS =

src/dummyThirdParty/MGridGen/dummyMGridGen.C

@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+//extern "C"
+//{
+#include "mgridgen.h"
+//}
+
+#include "error.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+static const char* notImplementedMessage =
+"You are trying to use MGridGen but do not have the MGridGen library loaded.\n"
+"This message is from the dummy MGridGen stub library instead.\n"
+"\n"
+"Normally the MGridGen library will be loaded through the LD_LIBRARY_PATH\n"
+"environment variable but you are picking up this dummy library from the\n"
+"$FOAM_LIBBIN/dummy directory. Please install MGridGen and make sure the\n"
+"libMGridGen.so is in your LD_LIBRARY_PATH.";
+
+#ifdef __cplusplus
+extern "C"
+#endif
+void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *,
+              int, int, int *, int *, int *, idxtype *)
+{
+    FatalErrorIn("MGridGen(..)")
+        << notImplementedMessage
+        << Foam::exit(Foam::FatalError);
+}
+
+
+// ************************************************************************* //

src/dummyThirdParty/MGridGen/mgridgen.h

@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Namespace
+    C linkage
+
+Description
+    Dummy stub for mgridgen library functions.
+    Only implements the absolute minimum we are using.
+
+SourceFiles
+    dummyMGridGen.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mgridgen_H
+#define mgridgen_H
+
+#include "scalar.H"
+
+#ifndef idxtype
+#define idxtype int
+#define realtype Foam::scalar
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+/*---------------------------------------------------------------------------*\
+                           Class metis Declaration
+\*---------------------------------------------------------------------------*/
+
+#ifdef __cplusplus
+extern "C"
+#endif
+void MGridGen(int, idxtype *, realtype *, realtype *, idxtype *, realtype *,
+              int, int, int *, int *, int *, idxtype *);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/dummyThirdParty/metisDecomp/Make/files

@@ -0,0 +1,3 @@
+dummyMetisDecomp.C
+
+LIB = $(FOAM_LIBBIN)/dummy/libmetisDecomp