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

applications/test/Polynomial/Test-Polynomial.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,6 +31,7 @@ Description
 
 #include "IStringStream.H"
 #include "Polynomial.H"
+#include "polynomialFunction.H"
 #include "Random.H"
 #include "cpuTime.H"
 
@@ -38,7 +39,7 @@ using namespace Foam;
 
 const int PolySize = 8;
 const scalar coeff[] = { 0.11, 0.45, -0.94, 1.58, -2.58, 0.08, 3.15, -4.78 };
-const char* polyDef = "testPoly (0.11 0.45 -0.94 1.58 -2.58 0.08 3.15 -4.78)";
+const char* polyDef = "(0.11 0.45 -0.94 1.58 -2.58 0.08 3.15 -4.78)";
 
 
 scalar polyValue(const scalar x)
@@ -58,7 +59,7 @@ scalar polyValue(const scalar x)
 
 scalar intPolyValue(const scalar x)
 {
-    // Hard-coded integrated form of above polynomial
+    // Hard-coded integral form of above polynomial
     return
         coeff[0]*x
       + coeff[1]/2.0*sqr(x)
@@ -109,27 +110,44 @@ int main(int argc, char *argv[])
     const label nIters = 1000;
     scalar sum = 0.0;
 
-    Info<< "null poly = " << (Polynomial<8>()) << nl << endl;
+    Info<< "null poly = " << (Polynomial<8>()) << nl
+        << "null poly = " << (polynomialFunction(8)) << nl
+        << endl;
 
-    // Polynomial<8> poly("testPoly", IStringStream(polyDef)());
     Polynomial<8> poly(coeff);
-    Polynomial<9> intPoly(poly.integrate(0.0));
+    Polynomial<9> intPoly(poly.integral(0.0));
 
-    Info<< "poly = " << poly << endl;
+    IStringStream is(polyDef);
-    Info<< "intPoly = " << intPoly << nl << endl;
+    polynomialFunction polyfunc(is);
 
-    Info<< "2*poly = " << 2*poly << endl;
+    Info<< "poly = " << poly << nl
-    Info<< "poly+poly = " << poly + poly << nl << endl;
+        << "intPoly = " << intPoly << nl
+        << endl;
 
-    Info<< "3*poly = " << 3*poly << endl;
+    Info<< "2*poly = " << 2*poly << nl
-    Info<< "poly+poly+poly = " << poly + poly + poly << nl << endl;
+        << "poly+poly = " << poly + poly << nl
+        << "3*poly = " << 3*poly << nl
+        << "poly+poly+poly = " << poly + poly + poly << nl
+        << "3*poly - 2*poly = " << 3*poly - 2*poly << nl
+        << endl;
+
+    Info<< nl << "--- as polynomialFunction" << nl << endl;
+    Info<< "polyf = " << polyfunc << nl
+        << "intPoly = " << poly.integral(0.0) << nl
+        << endl;
+
+    Info<< "2*polyf = " << 2*polyfunc << nl
+        << "polyf+polyf = " << polyfunc + polyfunc << nl
+        << "3*polyf = " << 3*polyfunc << nl
+        << "polyf+polyf+polyf = " << polyfunc + polyfunc + polyfunc << nl
+        << "3*polyf - 2*polyf = " << 3*polyfunc - 2*polyfunc << nl
+        << endl;
 
-    Info<< "3*poly - 2*poly = " << 3*poly - 2*poly << nl << endl;
 
     Polynomial<8> polyCopy = poly;
     Info<< "poly, polyCopy = " << poly << ", " << polyCopy << nl << endl;
     polyCopy = 2.5*poly;
-    Info<< "2.5*polyCopy = " << polyCopy << nl << endl;
+    Info<< "2.5*poly = " << polyCopy << nl << endl;
 
     Random rnd(123456);
     for (int i=0; i<10; i++)
@@ -139,8 +157,8 @@ int main(int argc, char *argv[])
         scalar px = polyValue(x);
         scalar ipx = intPolyValue(x);
 
-        scalar pxTest = poly.evaluate(x);
+        scalar pxTest = poly.value(x);
-        scalar ipxTest = intPoly.evaluate(x);
+        scalar ipxTest = intPoly.value(x);
 
         Info<<"\nx = " << x << endl;
         Info<< "    px, pxTest = " << px << ", " << pxTest << endl;
@@ -173,10 +191,21 @@ int main(int argc, char *argv[])
         sum = 0.0;
         for (label iter = 0; iter < nIters; ++iter)
         {
-            sum += poly.evaluate(loop+iter);
+            sum += poly.value(loop+iter);
         }
     }
-    Info<< "evaluate:     " << sum
+    Info<< "value:        " << sum
+        << " in " << timer.cpuTimeIncrement() << " s\n";
+
+    for (int loop = 0; loop < n; ++loop)
+    {
+        sum = 0.0;
+        for (label iter = 0; iter < nIters; ++iter)
+        {
+            sum += polyfunc.value(loop+iter);
+        }
+    }
+    Info<< "via function: " << sum
         << " in " << timer.cpuTimeIncrement() << " s\n";
 
 

applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C

@@ -40,7 +40,7 @@ Usage
 
 Note
     The cellTable information available in the files
-    \c constant/cellTable and @c constant/polyMesh/cellTableId
+    \c constant/cellTable and \c constant/polyMesh/cellTableId
     will be used if available. Otherwise the cellZones are used when
     creating the cellTable information.
 

applications/utilities/mesh/manipulation/insideCells/insideCells.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,8 +22,8 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    Picks up cells with cell centre 'inside' of surface. Requires surface
+    Picks up cells with cell centre 'inside' of surface.
-    to be closed and singly connected.
+    Requires surface to be closed and singly connected.
 
 \*---------------------------------------------------------------------------*/
 
@@ -42,9 +42,16 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "Create a cellSet for cells with their centres inside the defined "
+        "surface.\n"
+        "Surface must be closed and singly connected."
+    );
+
     argList::noParallel();
-    argList::validArgs.append("surface file");
+    argList::validArgs.append("surfaceFile");
-    argList::validArgs.append("destination cellSet");
+    argList::validArgs.append("cellSet");
 
 #   include "setRootCase.H"
 #   include "createTime.H"
@@ -75,14 +82,13 @@ int main(int argc, char *argv[])
     }
 
 
-    Info<< "Selected " << insideCells.size()
+    Info<< "Selected " << insideCells.size() << " of " << mesh.nCells()
-        << " cells out of " << mesh.nCells() << endl
+        << " cells" << nl << nl
-        << endl
         << "Writing selected cells to cellSet " << insideCells.name()
-        << endl << endl
+        << nl << nl
-        << "Use this cellSet e.g. with subsetMesh : " << endl << endl
+        << "Use this cellSet e.g. with subsetMesh : " << nl << nl
-        << "    subsetMesh <root> <case> " << insideCells.name()
+        << "    subsetMesh " << insideCells.name()
-        << endl << endl;
+        << nl << endl;
 
     insideCells.write();
 

applications/utilities/miscellaneous/foamDebugSwitches/Make/options

@@ -21,7 +21,6 @@ EXE_LIBS = \
     -ledgeMesh \
     -lengine \
     -lerrorEstimation \
-    -lEulerianInterfacialModels \
     -lextrudeModel \
     -lfieldFunctionObjects \
     -lfileFormats \

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/CMakeLists.txt

@@ -18,6 +18,7 @@ LINK_DIRECTORIES(
 )
 
 INCLUDE_DIRECTORIES(
+    $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}
     $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude
     $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude
     ${PROJECT_SOURCE_DIR}/../vtkPV3Foam

applications/utilities/preProcessing/changeDictionary/changeDictionary.C

@@ -29,7 +29,7 @@ Description
     type in the field and polyMesh/boundary files.
 
     Reads dictionaries (fields) and entries to change from a dictionary.
-    E.g. to make the \em movingWall a \em fixedValue for @em p but all other
+    E.g. to make the \em movingWall a \em fixedValue for \em p but all other
     \em Walls a zeroGradient boundary condition, the
     \c system/changeDictionaryDict would contain the following:
     \verbatim

bin/engridFoam

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -30,6 +30,7 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

bin/findEmptyMake

@@ -0,0 +1,82 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     findEmptyMake
+#
+# Description
+#     Usage: findEmptyMake [dir1 .. dirN]
+#
+#     Find Make/ directories without a 'files' or 'options' file.
+#     This can occur when a directory has been moved.
+#------------------------------------------------------------------------------
+usage() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+Usage: ${0##*/} [OPTION] [dir1 .. dirN]
+
+Find Make/ directories without a 'files' or 'options' file.
+This can occur when a directory has been moved.
+
+USAGE
+    exit 1
+}
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -*)
+       usage "unknown option: '$*'"
+       ;;
+    *)
+       break
+       ;;
+    esac
+done
+
+# default is the current directory
+[ "$#" -gt 0 ] || set -- .
+
+for checkDir
+do
+    if [ -d "$checkDir" ]
+    then
+        echo "searching: $checkDir" 1>&2
+    else
+        echo "skipping non-dir: $checkDir" 1>&2
+        continue
+    fi
+
+    find $checkDir -depth -name Make -type d -print | while read makeDir
+    do
+        [ -r "$makeDir/files" -a -r "$makeDir/options" ] || echo "$makeDir"
+    done
+
+done
+# -----------------------------------------------------------------------------

bin/finddep

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -30,9 +30,9 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
-
 Usage: ${0##*/} <file1> ... <fileN>
 
 * find all .dep files referring to any of <file1> ... <fileN>

bin/foamClearPolyMesh

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -31,8 +31,9 @@
 #
 #------------------------------------------------------------------------------
 usage() {
-    while [ "$#" -ge 1 ]; do echo "$1" 1>&2; shift; done
+    exec 1>&2
-    cat <<USAGE 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat <<USAGE
 
 Usage: ${0##*/} [OPTION]
 options:

bin/foamCopySettings

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -40,8 +40,9 @@ Script=${0##*/}
 
 #------------------------------------------------------------------------------
 usage() {
-    while [ "$#" -ge 1 ]; do echo "$1" 1>&2; shift; done
+    exec 1>&2
-    cat <<USAGE 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat <<USAGE
 
 Usage: $Script srcDir dstDir
 

bin/foamEndJob

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -38,6 +38,7 @@
 Script=${0##*/}
 
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 Usage: $Script [OPTION] <pid>

bin/foamEtcFile

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2008-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -33,10 +33,10 @@
 #     personal settings to site-wide settings.
 #
 #     For example, within the user ~/.OpenFOAM/<VER>/prefs.sh:
-#     @verbatim
+#     \code
 #        foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile -m go prefs.sh` \
 #            && _foamSource $foamPrefs
-#     @endverbatim
+#     \endcode
 #
 #-------------------------------------------------------------------------------
 usage() {

bin/foamExec

@@ -39,6 +39,7 @@
 #    foamEtcFile
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

bin/foamJob

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -29,6 +29,7 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

bin/foamLog

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -35,6 +35,7 @@ Script=${0##*/}
 toolsDir=${0%/*}/tools
 
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat <<USAGE
 

bin/foamNew

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -30,6 +30,7 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 Usage: ${0##*/} <type> {args}

bin/foamNewCase

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -37,6 +37,7 @@ templateDir="appTemplates"
 
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

bin/foamPack

@@ -33,12 +33,13 @@ packDir=$WM_PROJECT-$WM_PROJECT_VERSION
 toolsDir="${0%/*}/tools"  # this script is located in the tools/ parent dir
 
 usage() {
-    while [ $# -gt 0 ]; do echo "$1" 1>&2; shift; done
+    exec 1>&2
-cat <<USAGE 1>&2
+    while [ "$#" -gt 0 ]; do echo "$1"; shift; done
+cat <<USAGE
 Usage: ${0##*/} [OPTION]
 options:
-  -o <dir>          specify alternative output directory
+  -o, -output <dir>     specify alternative output directory
-  -nogit            bypass using 'git archive'
+  -nogit                bypass using 'git archive'
 
 * Pack and compress OpenFOAM directory for release
 
@@ -46,7 +47,7 @@ USAGE
     exit 1
 }
 
-unset prefix outputDir nogit
+unset outputDir nogit
 # parse options
 while [ "$#" -gt 0 ]
 do

bin/foamPackBin

@@ -46,7 +46,7 @@ case "${0##*/}" in
     ;;
 *)
     # regular
-    codeBase="OpenFOAM ThirdParty"
+    codeBase="OpenFOAM"
     packDir=$WM_PROJECT-$WM_PROJECT_VERSION
     listBinDirs=$toolsDir/foamListBinDirs
     ;;
@@ -54,11 +54,15 @@ esac
 
 
 usage() {
-    while [ $# -gt 0 ]; do echo "$1" 1>&2; shift; done
+    exec 1>&2
-cat <<USAGE 1>&2
+    while [ "$#" -gt 0 ]; do echo "$1"; shift; done
+cat <<USAGE
 Usage: ${0##*/} [OPTION] <archOptions>
+       ${0##*/} [OPTION] -current
 options:
-  -o <dir>          specify alternative output directory
+  -b, -bzip2            use bzip2 instead of gzip compression
+  -c, -current          use current value of \$WM_OPTIONS
+  -o, -output <dir>     specify alternative output directory
 
 * Pack and compress binary version of $codeBase for release
 
@@ -70,7 +74,9 @@ USAGE
 }
 
 
-unset prefix outputDir
+unset archOptions outputDir
+packExt=tgz
+
 # parse options
 while [ "$#" -gt 0 ]
 do
@@ -78,6 +84,14 @@ do
     -h | -help)
         usage
         ;;
+    -b | -bzip2)
+        packExt=tbz
+        shift
+        ;;
+    -c | -current)      # use $WM_OPTIONS - eg, 'linux64GccDPOpt'
+        archOptions="$WM_OPTIONS"
+        shift
+        ;;
     -o | -output)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         outputDir=${2%%/}
@@ -92,14 +106,17 @@ do
     esac
 done
 
-[ $# -eq 1 ] || usage "Error: specify architecture"
+if [ -n "$archOptions" ]
+then
+    [ $# -eq 0 ] || usage "Error: cannot specify both -current and architecture"
+else
+    archOptions="$1"
+    [ $# -eq 1 ] || usage "Error: specify architecture"
+fi
 
-# same as $WM_OPTIONS - eg, 'linux64GccDPOpt'
-archOptions="$1"
 
 #------------------------------------------------------------------------------
 timeStamp=$(date +%Y-%m-%d)
-packExt=tgz
 packBase=${packDir}.${archOptions}_${timeStamp}
 
 # add optional output directory
@@ -126,11 +143,20 @@ else
     exit 1
 fi
 
+# bzip2 or gzip compression
+case "$packFile" in
+*tbz)
+    tarOpt=cpjf
+    ;;
+*)
+    tarOpt=cpzf
+    ;;
+esac
 
 # Clean up on Ctrl-C
 trap 'rm -f $packFile 2>/dev/null' INT
 
-tar cpzf $packFile $dirList
+tar $tarOpt $packFile $dirList
 if [ $? -eq 0 ]
 then
     echo "Finished packing file $packFile" 1>&2

bin/foamPackDeps

@@ -0,0 +1,156 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     foamPackDeps [OPTION]
+#
+# Description
+#     Pack and compress *.dep files from OpenFOAM
+#
+# Script
+#     foamPackDeps [OPTION]
+#
+# Description
+#     Pack and compress *.dep files from OpenFOAM ThirdParty
+#
+#------------------------------------------------------------------------------
+toolsDir="${0%/*}/tools"  # this script is located in the tools/ parent dir
+
+case "${0##*/}" in
+*ThirdParty*)
+    # for ThirdParty
+    codeBase="OpenFOAM ThirdParty"
+    packDir=ThirdParty-$WM_PROJECT_VERSION
+    ;;
+*)
+    # regular
+    codeBase="OpenFOAM"
+    packDir=$WM_PROJECT-$WM_PROJECT_VERSION
+    ;;
+esac
+
+
+usage() {
+    exec 1>&2
+    while [ "$#" -gt 0 ]; do echo "$1"; shift; done
+cat <<USAGE
+Usage: ${0##*/} [OPTION]
+options:
+  -b, -bzip2            use bzip2 instead of gzip compression
+  -c, -current          for compatibility - currently ignored
+  -o, -output <dir>     specify alternative output directory
+
+* Pack and compress *.dep files from $codeBase
+
+USAGE
+    exit 1
+}
+
+
+unset archOptions outputDir
+packExt=tgz
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -b | -bzip2)
+        packExt=tbz
+        shift
+        ;;
+    -c | -current)      # use $WM_OPTIONS - eg, 'linux64GccDPOpt'
+        archOptions="$WM_OPTIONS"
+        shift
+        ;;
+    -o | -output)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        outputDir=${2%%/}
+        shift 2
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+# check for essential directories
+[ -d $packDir ] || {
+    echo "Error: directory $packDir does not exist" 1>&2
+    exit 1
+}
+
+
+#------------------------------------------------------------------------------
+timeStamp=$(date +%Y-%m-%d)
+packBase=${packDir}.deps_${timeStamp}
+
+# add optional output directory
+[ -d "$outputDir" ] && packBase="$outputDir/$packBase"
+packFile=$packBase.$packExt
+
+# avoid overwriting old pack file
+if [ -f $packFile ]
+then
+    echo "Error: $packFile already exists" 1>&2
+    exit 1
+fi
+
+cat <<INFO 1>&2
+-------------------------------------------------------------------------------
+Packing *.dep files into $packFile
+
+INFO
+
+
+# bzip2 or gzip compression
+case "$packFile" in
+*tbz)
+    tarOpt=cpjf
+    ;;
+*)
+    tarOpt=cpzf
+    ;;
+esac
+
+
+# Clean up on Ctrl-C
+trap 'rm -f $packFile 2>/dev/null' INT
+
+find -H $packDir -name '*.dep' -type f -print | tar $tarOpt $packFile -T -
+
+if [ $? -eq 0 ]
+then
+    echo "Finished packing *.dep files into $packFile" 1>&2
+else
+    echo "Error: failure packing *.dep files into $packFile" 1>&2
+    rm -f $packFile 2>/dev/null
+fi
+
+#------------------------------------------------------------------------------

bin/foamPackDoxygen

@@ -33,12 +33,14 @@ packDir=$WM_PROJECT-$WM_PROJECT_VERSION
 htmlDir=doc/Doxygen/html
 
 usage() {
-    while [ $# -gt 0 ]; do echo "$1" 1>&2; shift; done
+    exec 1>&2
-cat <<USAGE 1>&2
+    while [ "$#" -gt 0 ]; do echo "$1"; shift; done
+cat <<USAGE
 Usage: ${0##*/} [OPTION]
 options:
-  -prefix <dir>     use alternative prefix
+  -b, -bzip2            use bzip2 instead of gzip compression
-  -o <dir>          specify alternative output directory
+  -o, -output <dir>     specify alternative output directory
+  -prefix <dir>         use alternative prefix
 
 * Pack and compress the OpenFOAM doxygen html for release
 
@@ -46,7 +48,10 @@ USAGE
     exit 1
 }
 
+
 unset prefix outputDir
+packExt=tgz
+
 # parse options
 while [ "$#" -gt 0 ]
 do
@@ -54,16 +59,20 @@ do
     -h | -help)
         usage
         ;;
-    -prefix | --prefix)
+    -b | -bzip2)
-        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        packExt=tbz
-        prefix=${2%%/}
+        shift
-        shift 2
         ;;
     -o | -output)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         outputDir=${2%%/}
         shift 2
         ;;
+    -prefix | --prefix)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        prefix=${2%%/}
+        shift 2
+        ;;
     -*)
         usage "unknown option: '$*'"
         ;;
@@ -87,7 +96,6 @@ then
 fi
 
 #------------------------------------------------------------------------------
-packExt=tgz
 packName=${packDir}_Doxygen
 
 # add optional output directory
@@ -107,22 +115,32 @@ Packing doxygen html into $packFile
 
 INFO
 
+# bzip2 or gzip compression
+case "$packFile" in
+*tbz)
+    tarOpt=cpjf
+    ;;
+*)
+    tarOpt=cpzf
+    ;;
+esac
+
 # Clean up on Ctrl-C
 trap 'rm -f $packFile 2>/dev/null' INT
 
 if [ -n "$prefix" ]
 then
     # requires GNU tar
-    tar cpzf $packFile --transform="s@^@$prefix/@" $htmlDir
+    tar $tarOpt $packFile --transform="s@^@$prefix/@" $htmlDir
 else
-    tar cpzf $packFile $packDir/$htmlDir
+    tar $tarOpt $packFile $packDir/$htmlDir
 fi
 
 if [ $? -eq 0 ]
 then
-    echo "Finished packing doxygen html into file $packFile" 1>&2
+    echo "Finished packing doxygen html into $packFile" 1>&2
 else
-    echo "Error: failure packing doxygen html file $packFile" 1>&2
+    echo "Error: failure packing doxygen html into $packFile" 1>&2
     rm -f $packFile 2>/dev/null
 fi
 

bin/foamPackMake

@@ -0,0 +1,164 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     foamPackMake [OPTION] <archOptions>
+#
+# Description
+#     Pack and compress OpenFOAM Make/<archOptions> directories
+#
+# Script
+#     foamPackThirdPartyMake [OPTION] <archOptions>
+#
+# Description
+#     Pack and compress OpenFOAM ThirdParty Make/<archOptions> directories
+#
+#------------------------------------------------------------------------------
+toolsDir="${0%/*}/tools"  # this script is located in the tools/ parent dir
+
+case "${0##*/}" in
+*ThirdParty*)
+    # for ThirdParty
+    codeBase="OpenFOAM ThirdParty"
+    packDir=ThirdParty-$WM_PROJECT_VERSION
+    ;;
+*)
+    # regular
+    codeBase="OpenFOAM"
+    packDir=$WM_PROJECT-$WM_PROJECT_VERSION
+    ;;
+esac
+
+
+usage() {
+    exec 1>&2
+    while [ "$#" -gt 0 ]; do echo "$1"; shift; done
+cat <<USAGE
+Usage: ${0##*/} [OPTION] <archOptions>
+       ${0##*/} [OPTION] -current
+options:
+  -b, -bzip2            use bzip2 instead of gzip compression
+  -c, -current          use current value of \$WM_OPTIONS
+  -o, -output <dir>     specify alternative output directory
+
+* Pack and compress $codeBase Make/<archOptions> directories
+
+    The value of 'archOptions' normally corresponds to \$WM_OPTIONS
+    The current value of \$WM_OPTIONS = $WM_OPTIONS
+
+USAGE
+    exit 1
+}
+
+
+unset archOptions outputDir
+packExt=tgz
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -b | -bzip2)
+        packExt=tbz
+        shift
+        ;;
+    -c | -current)      # use $WM_OPTIONS - eg, 'linux64GccDPOpt'
+        archOptions="$WM_OPTIONS"
+        shift
+        ;;
+    -o | -output)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        outputDir=${2%%/}
+        shift 2
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+if [ -n "$archOptions" ]
+then
+    [ $# -eq 0 ] || usage "Error: cannot specify both -current and architecture"
+else
+    archOptions="$1"
+    [ $# -eq 1 ] || usage "Error: specify architecture"
+fi
+
+
+#------------------------------------------------------------------------------
+timeStamp=$(date +%Y-%m-%d)
+packBase=${packDir}.Make-${archOptions}_${timeStamp}
+
+# add optional output directory
+[ -d "$outputDir" ] && packBase="$outputDir/$packBase"
+packFile=$packBase.$packExt
+
+# avoid overwriting old pack file
+if [ -f $packFile ]
+then
+    echo "Error: $packFile already exists" 1>&2
+    exit 1
+fi
+
+cat <<INFO 1>&2
+-------------------------------------------------------------------------------
+Pack and compress Make/$archOptions* directories into $packFile
+
+INFO
+
+
+# bzip2 or gzip compression
+case "$packFile" in
+*tbz)
+    tarOpt=cpjf
+    ;;
+*)
+    tarOpt=cpzf
+    ;;
+esac
+
+
+# Clean up on Ctrl-C
+trap 'rm -f $packFile 2>/dev/null' INT
+
+find -H $packDir -depth -name Make -type d -print | \
+    xargs -i find '{}' -depth -name "$archOptions*" -type d -print | \
+    tar $tarOpt $packFile -T -
+
+if [ $? -eq 0 ]
+then
+    echo "Finished packing Make/$archOptions directories into $packFile" 1>&2
+else
+    echo "Error: failure packing Make/$archOptions directories into $packFile" 1>&2
+    rm -f $packFile 2>/dev/null
+fi
+
+#------------------------------------------------------------------------------

bin/foamPackThirdParty

@@ -33,8 +33,9 @@ packDir=ThirdParty-$WM_PROJECT_VERSION
 toolsDir="${0%/*}/tools"  # this script is located in the tools/ parent dir
 
 usage() {
-    while [ $# -gt 0 ]; do echo "$1" 1>&2; shift; done
+    exec 1>&2
-cat <<USAGE 1>&2
+    while [ "$#" -gt 0 ]; do echo "$1"; shift; done
+cat <<USAGE
 Usage: ${0##*/} [OPTION]
 options:
   -o <dir>          specify alternative output directory

bin/foamPackThirdPartyDeps

@@ -0,0 +1 @@
+foamPackDeps

bin/foamPackThirdPartyMake

@@ -0,0 +1 @@
+foamPackMake

bin/foamUpdateCaseFileHeader

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -33,6 +33,7 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

bin/paraFoam

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -33,6 +33,7 @@
 #     undefined behaviour
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

bin/rmdepall

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -29,8 +29,9 @@
 #     Remove all .dep files or remove .dep files referring to <file>
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE 1>&2
+    cat<<USAGE
 Usage: ${0##*/} [file]
 
 Remove all .dep files or remove .dep files referring to <file>

bin/rmdepold

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -34,8 +34,9 @@
 #         - optionally remove empty directories
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE 1>&2
+    cat<<USAGE
 Usage: ${0##*/} [OPTION] [dir1 .. dirN]
 options:
   -rmdir      find and remove empty directories (recursively)

bin/tools/foamConfigurePaths

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -30,6 +30,7 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

bin/tools/foamListBinDirs

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -23,7 +23,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
-#     foamListBinDirs <directory> <archOptions>
+#     foamListBinDirs <directory> [archOptions]
 #
 # Description
 #     Lists directories containing binary files of OpenFOAM
@@ -33,9 +33,9 @@
 #------------------------------------------------------------------------------
 toolsDir="${0%/*}"  # this script is already located in the tools/ directory
 
-[ $# -eq 2 ] || {
+[ $# -eq 1 -o $# -eq 2 ] || {
 cat <<USAGE 1>&2
-Usage : ${0##*/} <packDir> <archOptions>
+Usage : ${0##*/} <packDir> [archOptions]
 
 * Lists directories containing binary files for OpenFOAM
 
@@ -49,8 +49,13 @@ USAGE
 #------------------------------------------------------------------------------
 packDir="$1"
 
-# same as $WM_OPTIONS - eg, 'linux64GccDPOpt'
+# default to same as $WM_OPTIONS - eg, 'linux64GccDPOpt'
-archOptions="$2"
+archOptions="${2:-$WM_OPTIONS}"
+
+[ -n "$archOptions" ] || {
+    echo "Error: no archOptions specified" 1>&2
+    exit 1
+}
 
 # base arch (w/o precision, optimization, etc)
 # same as "$WM_ARCH$WM_COMPILER"
@@ -65,42 +70,18 @@ arch3264=$(echo "$archOS" | sed -e 's@64@-64@')
 
 
 #------------------------------------------------------------------------------
-
 # check for essential directories
-[ -d $packDir ] || {
+for dir in \
-    echo "Error: directory $packDir does not exist" 1>&2
+    $packDir \
-    exit 1
+    $packDir/platforms/$archOptions/bin \
-}
+    $packDir/platforms/$archOptions/lib \
-
+    ;
-
+do
-#
+    [ -d $dir ] || {
-# check places for libraries - same as $FOAM_LIBBIN
+        echo "Error: directory $dir does not exist" 1>&2
-# this has moved around a bit in the recent past
+        exit 1
-#
+    }
-[ -d $packDir/lib/$archOptions ] || \
+done
-[ -d $packDir/platforms/$archOptions/lib ] || {
-cat <<LIB_CHECK 1>&2
-Error: no directory for libraries exists:
-    $packDir/lib/$archOptions
-    $packDir/platforms/$archOptions/lib
-LIB_CHECK
-    exit 1
-}
-
-#
-# check places for executables - same as $FOAM_APPBIN
-# this has moved around a bit in the recent past
-#
-[ -d $packDir/applications/bin/$archOptions ] || \
-[ -d $packDir/platforms/$archOptions/bin ] || {
-cat <<BIN_CHECK 1>&2
-Error: no directory for executables exists:
-    $packDir/platforms/$archOptions/bin
-    $packDir/applications/bin/$archOptions
-BIN_CHECK
-    exit 1
-}
-
 
 #------------------------------------------------------------------------------
 # list of directories
@@ -108,13 +89,11 @@ dirList=$(
     for dir in \
         $packDir/platforms/$archOptions/bin \
         $packDir/platforms/$archOptions/lib \
-        $packDir/wmake/bin/$archCompiler \
+        $packDir/wmake/platforms/$archCompiler \
-        $packDir/wmake/bin/$archOS \
+        $packDir/wmake/platforms/$archOS \
         $packDir/wmake/rules/General \
         $packDir/wmake/rules/$archCompiler \
         $packDir/wmake/rules/$archOS \
-        $packDir/applications/bin/$archOptions \
-        $packDir/lib/$archOptions \
         ;
     do
         [ -d $dir ] && echo $dir

bin/tools/foamListSourceFiles

@@ -46,7 +46,7 @@ USAGE
 packDir=$(echo "$1" | sed -e 's@//*@/@g' -e 's@/$@@')
 
 # check for essential directories
-[ -d $packDir ] || {
+[ -d "$packDir" ] || {
     echo "Error: directory $packDir does not exist" 1>&2
     exit 1
 }
@@ -71,16 +71,15 @@ find -H $packDir                                                              \
  -a ! -name "*.tar"                                                           \
  -a ! -name "*.tar.gz"                                                        \
  -a ! -name "*.tgz"                                                           \
+ -a ! -name "*.tar.bz2"                                                       \
+ -a ! -name "*.tbz"                                                           \
  -a ! -name "core"                                                            \
  -a ! -name "core.[1-9]*"                                                     \
  -a ! -name "libccmio*"                                                       \
 | sed                                                                         \
- -e "\@$packDir/lib/@d"                                                       \
  -e '\@/\.git/@d'                                                             \
  -e '\@/\.tags/@d'                                                            \
  -e '\@/README\.org@d'                                                        \
- -e '\@/bin/[^/]*/@{ \@/bin/tools/@!d }'                                      \
- -e '\@/lib/@d'                                                               \
  -e '\@/platforms/@d'                                                         \
  -e '\@/t/@d'                                                                 \
  -e '\@/Make[.A-Za-z]*/[^/]*/@d'                                              \

bin/tools/foamListThirdPartyBinDirs

@@ -23,7 +23,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Script
-#     foamListThirdPartyBinDirs <directory> <archOptions>
+#     foamListThirdPartyBinDirs <directory> [archOptions]
 #
 # Description
 #     Lists directories containing binary files for OpenFOAM ThirdParty
@@ -33,9 +33,9 @@
 #------------------------------------------------------------------------------
 toolsDir="${0%/*}"  # this script is already located in the tools/ directory
 
-[ $# -eq 2 ] || {
+[ $# -eq 1 -o $# -eq 2 ] || {
 cat <<USAGE 1>&2
-Usage : ${0##*/} <packDir> <archOptions>
+Usage : ${0##*/} <packDir> [archOptions]
 
 * List directories containing binary files for OpenFOAM ThirdParty
 
@@ -49,8 +49,13 @@ USAGE
 #------------------------------------------------------------------------------
 packDir="$1"
 
-# same as $WM_OPTIONS - eg, 'linux64GccDPOpt'
+# default to same as $WM_OPTIONS - eg, 'linux64GccDPOpt'
-archOptions="$2"
+archOptions="${2:-$WM_OPTIONS}"
+
+[ -n "$archOptions" ] || {
+    echo "Error: no archOptions specified" 1>&2
+    exit 1
+}
 
 # base arch (w/o precision, optimization, etc)
 # same as "$WM_ARCH$WM_COMPILER"
@@ -66,7 +71,10 @@ arch3264=$(echo "$archOS" | sed -e 's@64@-64@')
 
 #------------------------------------------------------------------------------
 # check for essential directories
-for dir in $packDir $packDir/platforms/$archOptions/lib
+for dir in \
+    $packDir \
+    $packDir/platforms/$archOptions/lib \
+    ;
 do
     [ -d $dir ] || {
         echo "Error: directory $dir does not exist" 1>&2

bin/tools/foamPackSource

@@ -78,15 +78,25 @@ INFO
 wc $tmpFile | awk '{print "Packing",$1,"files - this could take some time ..."}' 1>&2
 
 
+# bzip2 or gzip compression
+case "$packFile" in
+*tbz)
+    tarOpt=cpjf
+    ;;
+*)
+    tarOpt=cpzf
+    ;;
+esac
+
 # Clean up on Ctrl-C
 trap 'rm -f $packFile $tmpFile 2>/dev/null' INT
 
-tar cpzf $packFile --files-from $tmpFile
+tar $tarOpt $packFile --files-from $tmpFile
 if [ $? -eq 0 ]
 then
-    echo "Finished packing $packDir into file $packFile" 1>&2
+    echo "Finished packing $packDir into $packFile" 1>&2
 else
-    echo "Error: failure packing $packDir into file $packFile" 1>&2
+    echo "Error: failure packing $packDir into $packFile" 1>&2
     rm -f $packFile 2>/dev/null
 fi
 

bin/tools/org-batch

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2009-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2009-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -32,10 +32,11 @@
 Script=${0##*/}
 
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-Usage: ${0##*/} [OPTIONS] file1 [.. fileN]
+Usage: $Script [OPTIONS] file1 [.. fileN]
 options:
   -html      create html (default)
   -latex     create LaTeX

bin/tools/pre-commit-hook

@@ -148,7 +148,7 @@ checkIllegalCode()
     do
         case "$f" in
         # exclude potential makefiles
-        (wmake/[Mm]akefile* | wmake/rules/*)
+        (*[Mm]akefile* | wmake/rules/*)
         ;;
         (*)
             # parse line numbers from grep output:

bin/tools/pre-receive-hook

@@ -111,7 +111,7 @@ checkIllegalCode()
     do
         case "$f" in
         # exclude potential makefiles
-        (wmake/[Mm]akefile* | wmake/rules/*)
+        (*[Mm]akefile* | wmake/rules/*)
         ;;
         (*)
             # parse line numbers from grep output:

bin/touchdep

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -28,25 +28,72 @@
 # Description
 #     touch all .dep files
 #------------------------------------------------------------------------------
+usage() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
 
-# default is pwd
+Usage: ${0##*/} [OPTION] [dir1] .. [dirN]
-if [ "$#" -eq 0 ]
+options:
-then
+  -make         limit selection to 'Make/\$WM_OPTIONS*' (Make/$WM_OPTIONS*)
-    set -- .
+  -help         print the usage
-elif [ "$1" = "-h" -o "$1" = "-help" ]
+
-then
+Find and touch all .dep files in the specified directories.
-    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+Uses the cwd by default if no directories are specified.
-    echo "    touch all .dep files"
+
+Current value of WM_OPTIONS=$WM_OPTIONS
+
+
+NOTE The '-make' is a future feature.
+This is currently no separation of .dep files by platforms.
+
+USAGE
     exit 1
-fi
+}
 
 
+unset restrictOpt
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -m | -make)
+        [ -n "$WM_OPTIONS" ] || usage "Error: -make option only valid when \$WM_OPTIONS is set"
+        restrictOpt=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+
+# no directories specified: default is pwd
+[ "$#" -gt 0 ] || set -- .
+
 for i
 do
     if [ -d "$i" ]
     then
-        echo "touching all .dep files: $i"
+        if [ "$restrictOpt" = true ]
-        find $i -name '*.dep' -print | xargs -t touch
+        then
+            echo "touching all .dep files under Make/$WM_OPTIONS* : $i"
+            find $i -depth -name Make -type d -print | \
+                xargs -i find '{}' -depth -name "$WM_OPTIONS*" -type d -print | \
+                xargs -i find '{}' -name '*.dep' -type f -print | \
+                xargs -t touch
+        else
+            echo "touching all .dep files: $i"
+            find $i -name '*.dep' -type f -print | xargs -t touch
+        fi
     else
         echo "no directory: $i"
     fi

bin/toucho

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -28,27 +28,71 @@
 # Description
 #     touch all .o files
 #------------------------------------------------------------------------------
+usage() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
 
-# default is pwd
+Usage: ${0##*/} [OPTION] [dir1] .. [dirN]
-if [ "$#" -eq 0 ]
+options:
-then
+  -make         limit selection to 'Make/\$WM_OPTIONS*'
-    set -- .
+  -help         print the usage
-elif [ "$1" = "-h" -o "$1" = "-help" ]
+
-then
+Find and touch all .o files in the specified directories.
-    echo "Usage: ${0##*/} [dir1] .. [dirN]"
+Uses the cwd by default if no directories are specified.
-    echo "    touch all .o files"
+
+Current value of WM_OPTIONS=$WM_OPTIONS
+
+USAGE
     exit 1
-fi
+}
 
 
+unset restrictOpt
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -m | -make)
+        [ -n "$WM_OPTIONS" ] || usage "Error: -make option only valid when \$WM_OPTIONS is set"
+        restrictOpt=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+
+# no directories specified: default is pwd
+[ "$#" -gt 0 ] || set -- .
+
 for i
 do
     if [ -d "$i" ]
     then
-        echo "touching all .o files: $i"
+        if [ "$restrictOpt" = true ]
-        find $i -name '*.o' -print | xargs -t touch
+        then
+            echo "touching all .o files under Make/$WM_OPTIONS* : $i"
+            find $i -depth -name Make -type d -print | \
+                xargs -i find '{}' -depth -name "$WM_OPTIONS*" -type d -print | \
+                xargs -i find '{}' -name '*.o' -type f -print | \
+                xargs -t touch
+        else
+            echo "touching all .o files: $i"
+            find $i -name '*.o' -type f -print | xargs -t touch
+        fi
     else
         echo "no directory: $i"
     fi
 done
+
 #------------------------------------------------------------------------------

etc/apps/paraview3/bashrc-EXAMPLE

@@ -0,0 +1,46 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     paraview3/bashrc-EXAMPLE
+#
+# Description
+#     Example of chaining to the standard paraview3/bashrc with a
+#     different ParaView_VERSION
+#
+# Note
+#     This file could be copied to a user or site location, but should never
+#     replace the default shipped version as this will cause an infinite loop
+#
+#------------------------------------------------------------------------------
+
+#
+# Use other (shipped) bashrc with a different ParaView_VERSION
+#
+
+foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o apps/paraview3/bashrc 2>/dev/null)
+[ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.9.0
+
+unset foamFile
+
+# -----------------------------------------------------------------------------

etc/bashrc

@@ -122,12 +122,12 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
 # Source files, possibly with some verbosity
 _foamSource()
 {
-   while [ $# -ge 1 ]
+    while [ $# -ge 1 ]
-   do
+    do
-      [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1"
+        [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1"
-      . $1
+        . $1
-      shift
+       shift
-   done
+    done
 }
 
 # Evaluate command-line parameters

src/Allwmake

@@ -39,6 +39,7 @@ parallel/decompose/AllwmakeLnInclude
 dummyThirdParty/Allwmake $*
 
 wmake $makeOption lagrangian/basic
+wmake $makeOption lagrangian/distributionModels
 wmake $makeOption finiteVolume
 wmake $makeOption genericPatchFields
 

src/OSspecific/POSIX/regExp.H

@@ -29,7 +29,7 @@ Description
 
 SeeAlso
     The manpage regex(7) for more information about POSIX regular expressions.
-    These differ somewhat from \c Perl and @c sed regular expressions.
+    These differ somewhat from \c Perl and \c sed regular expressions.
 
 SourceFiles
     regExp.C

src/OpenFOAM/Make/files

@@ -66,6 +66,7 @@ primitives/functions/DataEntry/makeDataEntries.C
 primitives/functions/DataEntry/polynomial/polynomial.C
 primitives/functions/DataEntry/polynomial/polynomialIO.C
 
+primitives/functions/Polynomial/polynomialFunction.C
 
 strings = primitives/strings
 $(strings)/string/string.C
@@ -164,11 +165,16 @@ $(functionEntries)/includeIfPresentEntry/includeIfPresentEntry.C
 $(functionEntries)/inputModeEntry/inputModeEntry.C
 $(functionEntries)/removeEntry/removeEntry.C
 
-calcEntry = $(functionEntries)/calcEntry
+/*
-$(calcEntry)/calcEntryParser.atg
+ * Requires customized coco-cpp
-$(calcEntry)/calcEntryInternal.C
+ * could be dropped or activated in the future
-$(calcEntry)/calcEntry.C
+ */
-
+/*
+  calcEntry = $(functionEntries)/calcEntry
+  $(calcEntry)/calcEntryParser.atg
+  $(calcEntry)/calcEntryInternal.C
+  $(calcEntry)/calcEntry.C
+*/
 
 IOdictionary = db/IOobjects/IOdictionary
 $(IOdictionary)/IOdictionary.C

src/OpenFOAM/db/dictionary/functionEntries/includeIfPresentEntry/includeIfPresentEntry.H

@@ -27,7 +27,7 @@ Class
 Description
     Specify a file to include if it exists. Expects a single string to follow.
 
-    The \c \#includeIfPresent directive is similar to the @c \#include
+    The \c \#includeIfPresent directive is similar to the \c \#include
     directive, but does not generate an error if the file does not exist.
 
 See Also

src/OpenFOAM/global/foamDoc.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,9 +21,9 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-@mainpage OpenFOAM&reg;: open source CFD
+\mainpage OpenFOAM&reg;: open source CFD
 
-@section about About OpenFOAM
+\section about About OpenFOAM
 
     OpenFOAM is a free, open source CFD software package produced by
     a commercial company,
@@ -35,7 +35,7 @@ License
     heat transfer, to solid dynamics and electromagnetics.
     <a href="http://www.openfoam.com/features">More ...</a>
 
-@section users Our commitment to the users
+\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">
@@ -48,7 +48,7 @@ License
     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
+\section opensource Our commitment to open source
 
    OpenCFD is committed to open source software, continually developing and
    maintaining OpenFOAM under the

src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C

@@ -550,11 +550,12 @@ Foam::label Foam::polyBoundaryMesh::whichPatch(const label faceIndex) const
 
 Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
 (
-    const wordList& patchNames
+    const wordReList& patchNames,
+    const bool warnNotFound
 ) const
 {
-    wordList allPatchNames = names();
+    const wordList allPatchNames(this->names());
-    labelHashSet ps(size());
+    labelHashSet ids(size());
 
     forAll(patchNames, i)
     {
@@ -562,20 +563,23 @@ Foam::labelHashSet Foam::polyBoundaryMesh::patchSet
         // of all patch names for matches
         labelList patchIDs = findStrings(patchNames[i], allPatchNames);
 
-        if (patchIDs.empty())
+        if (patchIDs.empty() && warnNotFound)
         {
-            WarningIn("polyBoundaryMesh::patchSet(const wordList&)")
+            WarningIn
-                << "Cannot find any patch names matching " << patchNames[i]
+            (
+                "polyBoundaryMesh::patchSet"
+                "(const wordReList&, const bool) const"
+            )   << "Cannot find any patch names matching " << patchNames[i]
                 << endl;
         }
 
         forAll(patchIDs, j)
         {
-            ps.insert(patchIDs[j]);
+            ids.insert(patchIDs[j]);
         }
     }
 
-    return ps;
+    return ids;
 }
 
 

src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H

@@ -38,6 +38,7 @@ SourceFiles
 #include "polyPatchList.H"
 #include "regIOobject.H"
 #include "labelPair.H"
+#include "wordReList.H"
 #include "HashSet.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -166,9 +167,13 @@ public:
         //- Per boundary face label the patch index
         const labelList& patchID() const;
 
-        //- Return the set of patch IDs corresponding to the given list of names
+        //- Return the set of patch IDs corresponding to the given names
-        //  Wild cards are expanded.
+        //  By default warns if given names are not found.
-        labelHashSet patchSet(const wordList&) const;
+        labelHashSet patchSet
+        (
+            const wordReList& patchNames,
+            const bool warnNotFound = true
+        ) const;
 
         //- Check whether all procs have all patches and in same order. Return
         //  true if in error.

src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C

@@ -41,6 +41,18 @@ Foam::Polynomial<PolySize>::Polynomial()
 }
 
 
+template<int PolySize>
+Foam::Polynomial<PolySize>::Polynomial
+(
+    const Polynomial<PolySize>& poly
+)
+:
+    VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
+    logActive_(poly.logActive_),
+    logCoeff_(poly.logCoeff_)
+{}
+
+
 template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial(const scalar coeffs[PolySize])
 :
@@ -68,7 +80,7 @@ Foam::Polynomial<PolySize>::Polynomial(const UList<scalar>& coeffs)
         (
             "Polynomial<PolySize>::Polynomial(const UList<scalar>&)"
         )   << "Size mismatch: Needed " << PolySize
-            << " but got " << coeffs.size()
+            << " but given " << coeffs.size()
             << nl << exit(FatalError);
     }
 
@@ -79,6 +91,39 @@ Foam::Polynomial<PolySize>::Polynomial(const UList<scalar>& coeffs)
 }
 
 
+// template<int PolySize>
+// Foam::Polynomial<PolySize>::Polynomial(const polynomialFunction& poly)
+// :
+//     VectorSpace<Polynomial<PolySize>, scalar, PolySize>(),
+//     logActive_(poly.logActive()),
+//     logCoeff_(poly.logCoeff())
+// {
+//     if (poly.size() != PolySize)
+//     {
+//         FatalErrorIn
+//         (
+//             "Polynomial<PolySize>::Polynomial(const polynomialFunction&)"
+//         )   << "Size mismatch: Needed " << PolySize
+//             << " but given " << poly.size()
+//             << nl << exit(FatalError);
+//     }
+//
+//     for (int i = 0; i < PolySize; ++i)
+//     {
+//         this->v_[i] = poly[i];
+//     }
+// }
+
+
+template<int PolySize>
+Foam::Polynomial<PolySize>::Polynomial(Istream& is)
+:
+    VectorSpace<Polynomial<PolySize>, scalar, PolySize>(is),
+    logActive_(false),
+    logCoeff_(0.0)
+{}
+
+
 template<int PolySize>
 Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 :
@@ -111,38 +156,17 @@ Foam::Polynomial<PolySize>::Polynomial(const word& name, Istream& is)
 }
 
 
-template<int PolySize>
-Foam::Polynomial<PolySize>::Polynomial(Istream& is)
-:
-    VectorSpace<Polynomial<PolySize>, scalar, PolySize>(is),
-    logActive_(false),
-    logCoeff_(0.0)
-{}
-
-
-template<int PolySize>
-Foam::Polynomial<PolySize>::Polynomial
-(
-    const Polynomial<PolySize>& poly
-)
-:
-    VectorSpace<Polynomial<PolySize>, scalar, PolySize>(poly),
-    logActive_(poly.logActive_),
-    logCoeff_(poly.logCoeff_)
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<int PolySize>
-bool& Foam::Polynomial<PolySize>::logActive()
+bool Foam::Polynomial<PolySize>::logActive() const
 {
     return logActive_;
 }
 
 
 template<int PolySize>
-Foam::scalar& Foam::Polynomial<PolySize>::logCoeff()
+Foam::scalar Foam::Polynomial<PolySize>::logCoeff() const
 {
     return logCoeff_;
 }
@@ -151,27 +175,27 @@ Foam::scalar& Foam::Polynomial<PolySize>::logCoeff()
 template<int PolySize>
 Foam::scalar Foam::Polynomial<PolySize>::value(const scalar x) const
 {
-    scalar y = this->v_[0];
+    scalar val = this->v_[0];
 
     // avoid costly pow() in calculation
     scalar powX = x;
     for (label i=1; i<PolySize; ++i)
     {
-        y += this->v_[i]*powX;
+        val += this->v_[i]*powX;
         powX *= x;
     }
 
     if (logActive_)
     {
-        y += logCoeff_*log(x);
+        val += logCoeff_*log(x);
     }
 
-    return y;
+    return val;
 }
 
 
 template<int PolySize>
-Foam::scalar Foam::Polynomial<PolySize>::integrateLimits
+Foam::scalar Foam::Polynomial<PolySize>::integrate
 (
     const scalar x1,
     const scalar x2
@@ -181,7 +205,7 @@ Foam::scalar Foam::Polynomial<PolySize>::integrateLimits
     {
         FatalErrorIn
         (
-            "scalar Polynomial<PolySize>::integrateLimits"
+            "scalar Polynomial<PolySize>::integrate"
             "("
                 "const scalar, "
                 "const scalar"
@@ -190,22 +214,33 @@ Foam::scalar Foam::Polynomial<PolySize>::integrateLimits
             << nl << abort(FatalError);
     }
 
-    intPolyType poly = this->integrate();
 
-    return poly.value(x2) - poly.value(x1);
+    // avoid costly pow() in calculation
+    scalar powX1 = x1;
+    scalar powX2 = x2;
+
+    scalar val = this->v_[0]*(powX2 - powX1);
+    for (label i=1; i<PolySize; ++i)
+    {
+        val += this->v_[i]/(i + 1) * (powX2 - powX1);
+        powX1 *= x1;
+        powX2 *= x2;
+    }
+
+    return val;
 }
 
 
 template<int PolySize>
 typename Foam::Polynomial<PolySize>::intPolyType
-Foam::Polynomial<PolySize>::integrate(const scalar intConstant)
+Foam::Polynomial<PolySize>::integral(const scalar intConstant) const
 {
     intPolyType newCoeffs;
 
     newCoeffs[0] = intConstant;
     forAll(*this, i)
     {
-        newCoeffs[i + 1] = this->v_[i]/(i + 1);
+        newCoeffs[i+1] = this->v_[i]/(i + 1);
     }
 
     return newCoeffs;
@@ -214,14 +249,14 @@ Foam::Polynomial<PolySize>::integrate(const scalar intConstant)
 
 template<int PolySize>
 typename Foam::Polynomial<PolySize>::polyType
-Foam::Polynomial<PolySize>::integrateMinus1(const scalar intConstant)
+Foam::Polynomial<PolySize>::integralMinus1(const scalar intConstant) const
 {
     polyType newCoeffs;
 
     if (this->v_[0] > VSMALL)
     {
-        newCoeffs.logActive() = true;
+        newCoeffs.logActive_ = true;
-        newCoeffs.logCoeff() = this->v_[0];
+        newCoeffs.logCoeff_ = this->v_[0];
     }
 
     newCoeffs[0] = intConstant;

src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H

@@ -29,14 +29,14 @@ Description
 
         poly = logCoeff*log(x) + sum(coeff_[i]*x^i)
 
-    where 0 \<= i \<= n
+    where 0 \<= i \<= N
 
     - integer powers, starting at zero
     - value(x) to evaluate the poly for a given value
     - integrate(x1, x2) between two scalar values
-    - integrate() to return a new, intergated coeff polynomial
+    - integral() to return a new, integral coeff polynomial
       - increases the size (order)
-    - integrateMinus1() to return a new, integrated coeff polynomial where
+    - integralMinus1() to return a new, integral coeff polynomial where
       the base poly starts at order -1
 
 SourceFiles
@@ -85,10 +85,10 @@ class Polynomial
 
     // Private data
 
-        //- Include the log term? - only activated using integrateMinus1()
+        //- Include the log term? - only activated using integralMinus1()
         bool logActive_;
 
-        //- Log coefficient - only activated using integrateMinus1()
+        //- Log coefficient - only activated using integralMinus1()
         scalar logCoeff_;
 
 
@@ -104,6 +104,9 @@ public:
         //- Construct null, with all coefficients = 0.0
         Polynomial();
 
+        //- Copy constructor
+        Polynomial(const Polynomial&);
+
         //- Construct from C-array of coefficients
         explicit Polynomial(const scalar coeffs[PolySize]);
 
@@ -111,24 +114,21 @@ public:
         explicit Polynomial(const UList<scalar>& coeffs);
 
         //- Construct from Istream
-        Polynomial(Istream& is);
+        Polynomial(Istream&);
 
         //- Construct from name and Istream
-        Polynomial(const word& name, Istream& is);
+        Polynomial(const word& name, Istream&);
-
-        //- Copy constructor
-        Polynomial(const Polynomial& poly);
 
 
     // Member Functions
 
         // Access
 
-            //- Return access to the log term active flag
+            //- Return true if the log term is active
-            bool& logActive();
+            bool logActive() const;
 
-            //- Return access to the log coefficient
+            //- Return the log coefficient
-            scalar& logCoeff();
+            scalar logCoeff() const;
 
 
         // Evaluation
@@ -136,16 +136,17 @@ public:
             //- Return polynomial value
             scalar value(const scalar x) const;
 
-            //- Return integrated polynomial coefficients
-            //  argument becomes zeroth element (constant of integration)
-            intPolyType integrate(const scalar intConstant = 0.0);
-
-            //- Return integrated polynomial coefficients when lowest order
-            //  is -1. Argument added to zeroth element
-            polyType integrateMinus1(const scalar intConstant = 0.0);
-
             //- Integrate between two values
-            scalar integrateLimits(const scalar x1, const scalar x2) const;
+            scalar integrate(const scalar x1, const scalar x2) const;
+
+
+            //- Return integral coefficients.
+            //  Argument becomes zeroth element (constant of integration)
+            intPolyType integral(const scalar intConstant = 0.0) const;
+
+            //- Return integral coefficients when lowest order is -1.
+            //  Argument becomes zeroth element (constant of integration)
+            polyType integralMinus1(const scalar intConstant = 0.0) const;
 
 
     //- Ostream Operator

src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.C

@@ -0,0 +1,415 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "polynomialFunction.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(polynomialFunction, 0);
+}
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+
+Foam::polynomialFunction Foam::polynomialFunction::cloneIntegral
+(
+    const polynomialFunction& poly,
+    const scalar intConstant
+)
+{
+    polynomialFunction newPoly(poly.size()+1);
+
+    newPoly[0] = intConstant;
+    forAll(poly, i)
+    {
+        newPoly[i+1] = poly[i]/(i + 1);
+    }
+
+    return newPoly;
+}
+
+
+Foam::polynomialFunction Foam::polynomialFunction::cloneIntegralMinus1
+(
+    const polynomialFunction& poly,
+    const scalar intConstant
+)
+{
+    polynomialFunction newPoly(poly.size()+1);
+
+    if (poly[0] > VSMALL)
+    {
+        newPoly.logActive_ = true;
+        newPoly.logCoeff_  = poly[0];
+    }
+
+    newPoly[0] = intConstant;
+    for (label i=1; i < poly.size(); ++i)
+    {
+        newPoly[i] = poly[i]/i;
+    }
+
+    return newPoly;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::polynomialFunction::polynomialFunction(const label order)
+:
+    scalarList(order, 0.0),
+    logActive_(false),
+    logCoeff_(0.0)
+{
+    if (this->empty())
+    {
+        FatalErrorIn
+        (
+            "polynomialFunction::polynomialFunction(const label order)"
+        )   << "polynomialFunction coefficients are invalid (empty)"
+            << nl << exit(FatalError);
+    }
+}
+
+
+Foam::polynomialFunction::polynomialFunction(const polynomialFunction& poly)
+:
+    scalarList(poly),
+    logActive_(poly.logActive_),
+    logCoeff_(poly.logCoeff_)
+{}
+
+
+Foam::polynomialFunction::polynomialFunction(const UList<scalar>& coeffs)
+:
+    scalarList(coeffs),
+    logActive_(false),
+    logCoeff_(0.0)
+{
+    if (this->empty())
+    {
+        FatalErrorIn
+        (
+            "polynomialFunction::polynomialFunction(const UList<scalar>&)"
+        )   << "polynomialFunction coefficients are invalid (empty)"
+            << nl << exit(FatalError);
+    }
+}
+
+
+Foam::polynomialFunction::polynomialFunction(Istream& is)
+:
+    scalarList(is),
+    logActive_(false),
+    logCoeff_(0.0)
+{
+    if (this->empty())
+    {
+        FatalErrorIn
+        (
+            "polynomialFunction::polynomialFunction(Istream&)"
+        )   << "polynomialFunction coefficients are invalid (empty)"
+            << nl << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::polynomialFunction::~polynomialFunction()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::polynomialFunction::logActive() const
+{
+    return logActive_;
+}
+
+
+Foam::scalar Foam::polynomialFunction::logCoeff() const
+{
+    return logCoeff_;
+}
+
+
+Foam::scalar Foam::polynomialFunction::value(const scalar x) const
+{
+    const scalarList& coeffs = *this;
+    scalar val = coeffs[0];
+
+    // avoid costly pow() in calculation
+    scalar powX = x;
+    for (label i=1; i<coeffs.size(); ++i)
+    {
+        val += coeffs[i]*powX;
+        powX *= x;
+    }
+
+    if (logActive_)
+    {
+        val += this->logCoeff_*log(x);
+    }
+
+    return val;
+}
+
+
+Foam::scalar Foam::polynomialFunction::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    const scalarList& coeffs = *this;
+
+    if (logActive_)
+    {
+        FatalErrorIn
+        (
+            "scalar polynomialFunction::integrate"
+            "("
+                "const scalar, "
+                "const scalar"
+            ") const"
+        )   << "Cannot integrate polynomial with logarithmic coefficients"
+            << nl << abort(FatalError);
+    }
+
+    // avoid costly pow() in calculation
+    scalar powX1 = x1;
+    scalar powX2 = x2;
+
+    scalar val = coeffs[0]*(powX2 - powX1);
+    for (label i=1; i<coeffs.size(); ++i)
+    {
+        val += coeffs[i]/(i + 1)*(powX2 - powX1);
+        powX1 *= x1;
+        powX2 *= x2;
+    }
+
+    return val;
+}
+
+
+Foam::polynomialFunction
+Foam::polynomialFunction::integral(const scalar intConstant) const
+{
+    return cloneIntegral(*this, intConstant);
+}
+
+
+Foam::polynomialFunction
+Foam::polynomialFunction::integralMinus1(const scalar intConstant) const
+{
+    return cloneIntegralMinus1(*this, intConstant);
+}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+Foam::polynomialFunction&
+Foam::polynomialFunction::operator+=(const polynomialFunction& poly)
+{
+    scalarList& coeffs = *this;
+
+    if (coeffs.size() > poly.size())
+    {
+        forAll(poly, i)
+        {
+            coeffs[i] += poly[i];
+        }
+    }
+    else
+    {
+        coeffs.setSize(poly.size(), 0.0);
+
+        forAll(coeffs, i)
+        {
+            coeffs[i] += poly[i];
+        }
+    }
+
+    return *this;
+}
+
+
+Foam::polynomialFunction&
+Foam::polynomialFunction::operator-=(const polynomialFunction& poly)
+{
+    scalarList& coeffs = *this;
+
+    if (coeffs.size() > poly.size())
+    {
+        forAll(poly, i)
+        {
+            coeffs[i] -= poly[i];
+        }
+    }
+    else
+    {
+        coeffs.setSize(poly.size(), 0.0);
+
+        forAll(coeffs, i)
+        {
+            coeffs[i] -= poly[i];
+        }
+    }
+
+    return *this;
+}
+
+
+Foam::polynomialFunction&
+Foam::polynomialFunction::operator*=(const scalar s)
+{
+    scalarList& coeffs = *this;
+    forAll(coeffs, i)
+    {
+        coeffs[i] *= s;
+    }
+
+    return *this;
+}
+
+
+Foam::polynomialFunction&
+Foam::polynomialFunction::operator/=(const scalar s)
+{
+    scalarList& coeffs = *this;
+    forAll(coeffs, i)
+    {
+        coeffs[i] /= s;
+    }
+
+    return *this;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const polynomialFunction& poly)
+{
+    // output like VectorSpace
+    os  << token::BEGIN_LIST;
+
+    if (!poly.empty())
+    {
+        for (int i=0; i<poly.size()-1; i++)
+        {
+            os  << poly[i] << token::SPACE;
+        }
+        os  << poly.last();
+    }
+    os  << token::END_LIST;
+
+
+    // Check state of Ostream
+    os.check("operator<<(Ostream&, const polynomialFunction&)");
+
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+Foam::polynomialFunction
+Foam::operator+
+(
+    const polynomialFunction& p1,
+    const polynomialFunction& p2
+)
+{
+    polynomialFunction poly(p1);
+    return poly += p2;
+}
+
+
+Foam::polynomialFunction
+Foam::operator-
+(
+    const polynomialFunction& p1,
+    const polynomialFunction& p2
+)
+{
+    polynomialFunction poly(p1);
+    return poly -= p2;
+}
+
+
+Foam::polynomialFunction
+Foam::operator*
+(
+    const scalar s,
+    const polynomialFunction& p
+)
+{
+    polynomialFunction poly(p);
+    return poly *= s;
+}
+
+
+Foam::polynomialFunction
+Foam::operator/
+(
+    const scalar s,
+    const polynomialFunction& p
+)
+{
+    polynomialFunction poly(p);
+    return poly /= s;
+}
+
+
+Foam::polynomialFunction
+Foam::operator*
+(
+    const polynomialFunction& p,
+    const scalar s
+)
+{
+    polynomialFunction poly(p);
+    return poly *= s;
+}
+
+
+Foam::polynomialFunction
+Foam::operator/
+(
+    const polynomialFunction& p,
+    const scalar s
+)
+{
+    polynomialFunction poly(p);
+    return poly /= s;
+}
+
+
+// ************************************************************************* //

src/OpenFOAM/primitives/functions/Polynomial/polynomialFunction.H

@@ -0,0 +1,246 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011-2011 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::polynomialFunction
+
+Description
+    Polynomial function representation
+
+        poly = logCoeff*log(x) + sum(coeff_[i]*x^i)
+
+    where 0 \<= i \<= N
+
+    - integer powers, starting at zero
+    - value(x) to evaluate the poly for a given value
+    - integrate(x1, x2) between two scalar values
+    - integral() to return a new, integral coeff polynomial
+      - increases the size (order)
+    - integralMinus1() to return a new, integral coeff polynomial where
+      the base poly starts at order -1
+
+SeeAlso
+    Foam::Polynomial for a templated implementation
+
+SourceFiles
+    polynomialFunction.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef polynomialFunction_H
+#define polynomialFunction_H
+
+#include "scalarList.H"
+#include "Ostream.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class polynomialFunction;
+
+// Forward declaration of friend functions
+Ostream& operator<<(Ostream&, const polynomialFunction&);
+
+
+/*---------------------------------------------------------------------------*\
+                     Class polynomialFunction Declaration
+\*---------------------------------------------------------------------------*/
+
+class polynomialFunction
+:
+    private scalarList
+{
+    // Private data
+
+        //- Include the log term? - only activated using integralMinus1()
+        bool logActive_;
+
+        //- Log coefficient - only activated using integralMinus1()
+        scalar logCoeff_;
+
+
+    // Private Member Functions
+
+        //- Return integral coefficients.
+        //  Argument becomes zeroth element (constant of integration)
+        static polynomialFunction cloneIntegral
+        (
+            const polynomialFunction&,
+            const scalar intConstant = 0.0
+        );
+
+        //- Return integral coefficients when lowest order is -1.
+        //  Argument becomes zeroth element (constant of integration)
+        static polynomialFunction cloneIntegralMinus1
+        (
+            const polynomialFunction&,
+            const scalar intConstant = 0.0
+        );
+
+
+        //- Disallow default bitwise assignment
+        void operator=(const polynomialFunction&);
+
+
+
+public:
+
+    //- Runtime type information
+    TypeName("polynomialFunction");
+
+
+    // Constructors
+
+        //- Construct a particular size, with all coefficients = 0.0
+        explicit polynomialFunction(const label);
+
+        //- Copy constructor
+        polynomialFunction(const polynomialFunction&);
+
+        //- Construct from a list of coefficients
+        explicit polynomialFunction(const UList<scalar>& coeffs);
+
+        //- Construct from Istream
+        polynomialFunction(Istream&);
+
+
+    //- Destructor
+    virtual ~polynomialFunction();
+
+
+    // Member Functions
+
+            //- Return the number of coefficients
+            using scalarList::size;
+
+            //- Return coefficient
+            using scalarList::operator[];
+
+
+        // Access
+
+
+            //- Return true if the log term is active
+            bool logActive() const;
+
+            //- Return the log coefficient
+            scalar logCoeff() const;
+
+
+        // Evaluation
+
+            //- Return polynomial value
+            scalar value(const scalar x) const;
+
+            //- Integrate between two values
+            scalar integrate(const scalar x1, const scalar x2) const;
+
+
+            //- Return integral coefficients.
+            //  Argument becomes zeroth element (constant of integration)
+            polynomialFunction integral
+            (
+                const scalar intConstant = 0.0
+            ) const;
+
+            //- Return integral coefficients when lowest order is -1.
+            //  Argument becomes zeroth element (constant of integration)
+            polynomialFunction integralMinus1
+            (
+                const scalar intConstant = 0.0
+            ) const;
+
+
+    // Member Operators
+
+        polynomialFunction& operator+=(const polynomialFunction&);
+        polynomialFunction& operator-=(const polynomialFunction&);
+
+        polynomialFunction& operator*=(const scalar);
+        polynomialFunction& operator/=(const scalar);
+
+
+    //- Ostream Operator
+    friend Ostream& operator<<(Ostream&, const polynomialFunction&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
+
+polynomialFunction operator+
+(
+    const polynomialFunction&,
+    const polynomialFunction&
+);
+
+
+polynomialFunction operator-
+(
+    const polynomialFunction&,
+    const polynomialFunction&
+);
+
+
+polynomialFunction operator*
+(
+    const scalar,
+    const polynomialFunction&
+);
+
+
+polynomialFunction operator/
+(
+    const scalar,
+    const polynomialFunction&
+);
+
+
+polynomialFunction operator*
+(
+    const polynomialFunction&,
+    const scalar
+);
+
+
+polynomialFunction operator/
+(
+    const polynomialFunction&,
+    const scalar
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

src/conversion/meshWriter/meshWriter.H

@@ -35,7 +35,7 @@ Description
     write OpenFOAM meshes and/or results to another CFD format
     - currently just STAR-CD
 
-@par Files
+\par Files
 
     "constant/boundaryRegion" is an IOMap<dictionary> that contains
     the boundary type and names. eg,

src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C

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

src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C

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

src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,6 +36,7 @@ SourceFiles
 #define inverseDistanceDiffusivity_H
 
 #include "uniformDiffusivity.H"
+#include "wordReList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class inverseDistanceDiffusivity Declaration
+                 Class inverseDistanceDiffusivity Declaration
 \*---------------------------------------------------------------------------*/
 
 class inverseDistanceDiffusivity
@@ -53,9 +54,8 @@ class inverseDistanceDiffusivity
     // Private data
 
         //- Patches selected to base the distance on
-        //  These can contain regular expressions and the actual patch names
+        //  These can contain patch names or regular expressions to search for.
-        //  will be searched for.
+        wordReList patchNames_;
-        wordList patchNames_;
 
 
     // Private Member Functions

src/meshTools/cellDist/cellDistFuncs.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,14 +28,9 @@ License
 #include "wallPolyPatch.H"
 #include "polyBoundaryMesh.H"
 
-namespace Foam
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-{
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+defineTypeNameAndDebug(Foam::cellDistFuncs, 0);
-
-defineTypeNameAndDebug(cellDistFuncs, 0);
-
-}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -61,7 +56,6 @@ Foam::label Foam::cellDistFuncs::findIndex
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from mesh
 Foam::cellDistFuncs::cellDistFuncs(const polyMesh& mesh)
 :
     mesh_(mesh)
@@ -70,36 +64,12 @@ Foam::cellDistFuncs::cellDistFuncs(const polyMesh& mesh)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Get patch ids of named patches
 Foam::labelHashSet Foam::cellDistFuncs::getPatchIDs
 (
-    const wordList& patchNames
+    const wordReList& patchNames
 ) const
 {
-    const polyBoundaryMesh& bMesh = mesh().boundaryMesh();
+    return mesh().boundaryMesh().patchSet(patchNames, false);
-
-    // Construct Set of patchNames for easy checking if included
-    HashSet<word> patchNamesHash(patchNames.size());
-
-    forAll(patchNames, patchI)
-    {
-        patchNamesHash.insert(patchNames[patchI]);
-    }
-
-    // Loop over all patches and check if patch name in hashset
-
-    labelHashSet patchIDs(bMesh.size());
-
-    forAll(bMesh, patchI)
-    {
-        const polyPatch& patch = bMesh[patchI];
-
-        if (patchNamesHash.found(patch.name()))
-        {
-            patchIDs.insert(patchI);
-        }
-    }
-    return patchIDs;
 }
 
 
@@ -252,8 +222,10 @@ Foam::label Foam::cellDistFuncs::getPointNeighbours
 
 
 // size of largest patch (out of supplied subset of patches)
-Foam::label Foam::cellDistFuncs::maxPatchSize(const labelHashSet& patchIDs)
+Foam::label Foam::cellDistFuncs::maxPatchSize
- const
+(
+    const labelHashSet& patchIDs
+) const
 {
     label maxSize = 0;
 
@@ -271,8 +243,11 @@ Foam::label Foam::cellDistFuncs::maxPatchSize(const labelHashSet& patchIDs)
 
 
 // sum of patch sizes (out of supplied subset of patches)
-Foam::label Foam::cellDistFuncs::sumPatchSize(const labelHashSet& patchIDs)
+Foam::label Foam::cellDistFuncs::sumPatchSize
- const
+(
+    const labelHashSet& patchIDs
+)
+const
 {
     label sum = 0;
 

src/meshTools/cellDist/cellDistFuncs.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -39,7 +39,7 @@ SourceFiles
 #include "scalarField.H"
 #include "HashSet.H"
 #include "Map.H"
-#include "wordList.H"
+#include "wordReList.H"
 #include "scalarField.H"
 #include "point.H"
 #include "primitivePatch.H"
@@ -98,8 +98,8 @@ public:
             return mesh_;
         }
 
-        //- Get patchIDs of named patches
+        //- Return the set of patch IDs corresponding to the given names
-        labelHashSet getPatchIDs(const wordList&) const;
+        labelHashSet getPatchIDs(const wordReList& patchNames) const;
 
         //- Get patchIDs of/derived off certain type (e.g. 'processorPolyPatch')
         //  Uses isA, not isType

src/meshTools/coordinateSystems/coordinateRotation/coordinateRotation.H

@@ -32,7 +32,7 @@ Description
     or (e3/e1). Any nonorthogonality will be absorbed into the second vector.
 
     For convenience, the dictionary constructor forms allow a few shortcuts:
-    - if the \c type is not otherwise specified, the type @c axes
+    - if the \c type is not otherwise specified, the type \c axes
       is implicit
     - if an axes specification (eg, e3/e1) is used, the coordinateRotation
       sub-dictionary can be dropped.

src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2010-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2010-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -87,8 +87,7 @@ void Foam::nearWallFields::read(const dictionary& dict)
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
         dict.lookup("fields") >> fieldSet_;
-        patchSet_ =
+        patchSet_ = mesh.boundaryMesh().patchSet(dict.lookup("patches"));
-            mesh.boundaryMesh().patchSet(wordList(dict.lookup("patches")));
         distance_ = readScalar(dict.lookup("distance"));
 
 

src/postProcessing/functionObjects/forces/forces/forces.C

@@ -229,8 +229,7 @@ void Foam::forces::read(const dictionary& dict)
 
         const fvMesh& mesh = refCast<const fvMesh>(obr_);
 
-        patchSet_ =
+        patchSet_ = mesh.boundaryMesh().patchSet(dict.lookup("patches"));
-            mesh.boundaryMesh().patchSet(wordList(dict.lookup("patches")));
 
         if (directForceDensity_)
         {

src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H

@@ -96,7 +96,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -110,7 +110,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -124,7 +124,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -138,7 +138,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -152,7 +152,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,

src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H

@@ -117,7 +117,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -131,7 +131,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -145,7 +145,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -159,7 +159,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -173,7 +173,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,

src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H

@@ -107,7 +107,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -121,7 +121,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -135,7 +135,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -149,7 +149,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -163,7 +163,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,

src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H

@@ -128,7 +128,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -142,7 +142,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -156,7 +156,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -170,7 +170,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -184,7 +184,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,

src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H

@@ -129,7 +129,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -143,7 +143,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -157,7 +157,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,

src/sampling/sampledSurface/writers/surfaceWriter.H

@@ -119,7 +119,7 @@ public:
         //- Write single surface geometry to file.
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -132,7 +132,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -147,7 +147,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -162,7 +162,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -177,7 +177,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -192,7 +192,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,

src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H

@@ -105,7 +105,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -119,7 +119,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -133,7 +133,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -147,7 +147,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,
@@ -161,7 +161,7 @@ public:
         //  One value per face or vertex (isNodeValues = true)
         virtual void write
         (
-            const fileName& outputDir,      // <root>/<case>/surface/TIME
+            const fileName& outputDir,      // <case>/surface/TIME
             const fileName& surfaceName,    // name of surface
             const pointField& points,
             const faceList& faces,

src/surfMesh/surfaceFormats/ofs/OFSsurfaceFormat.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -28,7 +28,7 @@ Description
     Provide a means of reading/writing the single-file OpenFOAM surface format.
 
 Note
-   This class provides more methods than the regular surface format interface.x
+    This class provides more methods than the regular surface format interface.
 
 SourceFiles
     OFSsurfaceFormat.C

src/surfMesh/surfaceFormats/stl/STLsurfaceFormatASCII.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -36,7 +36,7 @@ License
 using namespace Foam;
 
 // Dummy yyFlexLexer::yylex() to keep the linker happy. It is not called
-//! @cond dummy
+//! \cond dummy
 int yyFlexLexer::yylex()
 {
     FatalErrorIn("yyFlexLexer::yylex()")
@@ -44,12 +44,12 @@ int yyFlexLexer::yylex()
         << abort(FatalError);
     return 0;
 }
-//! @endcond
+//! \endcond
 
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-//! @cond dummy
+//! \cond dummy
 #if YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
@@ -58,7 +58,7 @@ int yyFlexLexer::yywrap()
 {
     return 1;
 }
-//! @endcond
+//! \endcond
 
 
 //- A lexer for parsing STL ASCII files.

src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,7 +38,7 @@ License
 int Foam::chemkinReader::yyBufSize = YY_BUF_SIZE;
 
 // Dummy yyFlexLexer::yylex() to keep the linker happy. It is not called
-//! @cond dummy
+//! \cond dummy
 int yyFlexLexer::yylex()
 {
     FatalErrorIn("yyFlexLexer::yylex()")
@@ -47,13 +47,13 @@ int yyFlexLexer::yylex()
 
     return 0;
 }
-//! @endcond
+//! \endcond
 
 
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-//! @cond dummy
+//! \cond dummy
 #if YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
@@ -62,7 +62,7 @@ int yyFlexLexer::yywrap()
 {
     return 1;
 }
-//! @endcond
+//! \endcond
 
 
 Foam::string foamSpecieString(const char* YYText)

src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C

@@ -45,8 +45,8 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     Sf_ *= this->W();
     CpCoeffs_ *= this->W();
 
-    hCoeffs_ = CpCoeffs_.integrate();
+    hCoeffs_ = CpCoeffs_.integral();
-    sCoeffs_ = CpCoeffs_.integrateMinus1();
+    sCoeffs_ = CpCoeffs_.integralMinus1();
 
     // Offset h poly so that it is relative to the enthalpy at Tstd
     hCoeffs_[0] += Hf_ - hCoeffs_.value(specie::Tstd);
@@ -73,8 +73,8 @@ Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
     Sf_ *= this->W();
     CpCoeffs_ *= this->W();
 
-    hCoeffs_ = CpCoeffs_.integrate();
+    hCoeffs_ = CpCoeffs_.integral();
-    sCoeffs_ = CpCoeffs_.integrateMinus1();
+    sCoeffs_ = CpCoeffs_.integralMinus1();
 
     // Offset h poly so that it is relative to the enthalpy at Tstd
     hCoeffs_[0] += Hf_ - hCoeffs_.value(specie::Tstd);

src/triSurface/triSurface/interfaces/STL/readSTLASCII.L

@@ -39,7 +39,7 @@ License
 using namespace Foam;
 
 // Dummy yyFlexLexer::yylex() to keep the linker happy. It is not called
-//! @cond dummy
+//! \cond dummy
 int yyFlexLexer::yylex()
 {
     FatalErrorIn("yyFlexLexer::yylex()")
@@ -47,12 +47,12 @@ int yyFlexLexer::yylex()
         << abort(FatalError);
     return 0;
 }
-//! @endcond
+//! \endcond
 
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
-//! @cond dummy
+//! \cond dummy
 #if YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
@@ -61,7 +61,7 @@ int yyFlexLexer::yywrap()
 {
     return 1;
 }
-//! @endcond
+//! \endcond
 
 
 class STLLexer

wmake/Makefile

@@ -106,7 +106,7 @@ SEXE            = a.out
 
 GENERAL_RULES = $(WM_DIR)/rules/General
 RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
-BIN           = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
+WMAKE_BIN     = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
 
 include $(GENERAL_RULES)/general
 include $(RULES)/general

wmake/makeWmake

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -26,13 +26,40 @@
 #     makeWmake
 #
 # Description
-#     Script to build all the system-specific parts of wmake
+#     Build platform-specific parts of wmake
 #
 #------------------------------------------------------------------------------
+usage() {
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+usage: ${0##*/}
 
-# run from this directory only
+  Build platform-specific parts of wmake
-cd ${0%/*} || exit 1
 
-( cd src && make $@ )
+USAGE
+    exit 1
+}
+
+case "$1" in
+-h | -help)
+    usage
+    ;;
+esac
+
+
+echo ========================================
+echo Build platform-specific parts of wmake
+echo
+(
+    set -x
+    cd ${0%/*}/src && make $@
+    # or simply:  make -C ${0%/*}/src $@
+)
+echo
+echo ========================================
+echo Done building wmake
+echo ========================================
+echo
 
 #------------------------------------------------------------------------------

wmake/rules/General/sourceToDep

@@ -1,6 +1,6 @@
 .SUFFIXES: .c .cc .cxx .cpp .C .F .f .dep
 
-MKDEP       = $(BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
+MKDEP       = $(WMAKE_BIN)/wmkdep -I$(*D) $(LIB_HEADER_DIRS)
 
 .c.dep:
 	$(MAKE_DEP)

wmake/scripts/makeFiles

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -38,7 +38,7 @@ then
     exit 1
 fi
 
-dirToString=$WM_DIR/bin/$WM_ARCH$WM_COMPILER/dirToString
+dirToString=$WM_DIR/platforms/$WM_ARCH$WM_COMPILER/dirToString
 
 [ -d Make ] || mkdir Make
 rm -f Make/files

wmake/src/Makefile

@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -49,7 +49,7 @@ SHELL      = /bin/sh
 
 GENERAL_RULES = $(WM_DIR)/rules/General
 RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
-BIN           = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
+WMAKE_BIN     = $(WM_DIR)/platforms/$(WM_ARCH)$(WM_COMPILER)
 
 include $(RULES)/general
 include $(RULES)/$(WM_LINK_LANGUAGE)
@@ -59,31 +59,31 @@ include $(RULES)/$(WM_LINK_LANGUAGE)
 # targets
 #------------------------------------------------------------------------------
 
-all:  $(BIN)/dirToString $(BIN)/wmkdep $(BIN)/wmkdepend
+all:  $(WMAKE_BIN)/dirToString $(WMAKE_BIN)/wmkdep $(WMAKE_BIN)/wmkdepend
 
 clean:
-	rm -f $(BIN)/dirToString $(BIN)/wmkdep $(BIN)/wmkdepend 2>/dev/null
+	rm -f $(WMAKE_BIN)/* 2>/dev/null
 
 
-$(BIN)/dirToString: dirToString.c
+$(WMAKE_BIN)/dirToString: dirToString.c
-	@mkdir -p $(BIN)
+	@mkdir -p $(WMAKE_BIN)
-	$(cc) $(cFLAGS) dirToString.c -o $(BIN)/dirToString
+	$(cc) $(cFLAGS) dirToString.c -o $(WMAKE_BIN)/dirToString
 
 
-$(BIN)/wmkdep: wmkdep.l
+$(WMAKE_BIN)/wmkdep: wmkdep.l
-	@mkdir -p $(BIN)
+	@mkdir -p $(WMAKE_BIN)
 	flex wmkdep.l
-	$(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep
+	$(cc) $(cFLAGS) lex.yy.c -o $(WMAKE_BIN)/wmkdep
 	@rm -f lex.yy.c 2>/dev/null
 
 
 # for bootstrapping - use generated files directly (instead of from .atg file)
-$(BIN)/wmkdepend: wmkdepend.cpp \
+$(WMAKE_BIN)/wmkdepend: wmkdepend.cpp \
     wmkdependParser.cpp wmkdependScanner.cpp \
     wmkdependParser.h   wmkdependScanner.h
-	@mkdir -p $(BIN)
+	@mkdir -p $(WMAKE_BIN)
 	$(CC) $(c++FLAGS) \
 	     wmkdepend.cpp wmkdependParser.cpp wmkdependScanner.cpp \
-	    -o $(BIN)/wmkdepend
+	    -o $(WMAKE_BIN)/wmkdepend
 
 #------------------------------------------------------------------------------

wmake/wcleanAll

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -30,33 +30,44 @@
 #     directories of all machines and delete them.
 #
 #------------------------------------------------------------------------------
-if [ "$1" = "-h" -o "$1" = "-help" ]
+usage() {
-then
+    exec 1>&2
-    echo "Usage: ${0##*/}"
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    echo
+    cat<<USAGE
-    echo "    Remove all object files and *.dep files"
+usage: ${0##*/}
-    exit 1
-fi
 
-[ -d bin -a -d src ] || {
+    Remove all object files and *.dep files
-    echo "${0##*/}: not in the project top level directory"
+
+USAGE
     exit 1
 }
 
-for dir in lib bin applications/bin
+# parse options
+while [ "$#" -gt 0 ]
 do
-    echo "Removing non-tools directories from $dir/"
+    case "$1" in
-    if [ -d $dir ]
+    -h | -help)
-    then
+        usage
-        find $dir -mindepth 1 -type d \! -name tools | xargs rm -rf
+        ;;
-    fi
+    *)
+        usage "unknown option/argument: '$*'"
+        ;;
+    esac
 done
 
+[ -d bin -a -d src ] || usage "not in the project top level directory"
+
+
+echo "Removing platforms/ subdirectores"
+rm -rf platforms/*
+
 echo "Removing *.dep files"
 find . -name '*.dep' -exec rm {} \;
 
 echo "Cleaning Make subdirectories"
-find `find . -depth \( -name "Make.[A-Za-z]*" -o -name Make \) -type d -print` -depth \( -type d ! -name "*Make.[A-Za-z]*" ! -name "*Make" \) -exec rm -rf {} \;
+find . -depth \( -name Make -o -name "Make.[A-Za-z]*" \) -type d -print | \
+    xargs -i find '{}' -mindepth 1 -maxdepth 1 -type d -print | \
+    xargs rm -rf
 
 echo "Removing lnInclude and intermediate directories"
 find . -depth -type d \( -name lnInclude -o -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;

wmake/wcleanMachine

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -33,6 +33,7 @@
 #
 #------------------------------------------------------------------------------
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 usage: ${0##*/} machineType [... machineTypeN]
@@ -40,32 +41,39 @@ usage: ${0##*/} machineType [... machineTypeN]
   Searches the directories below the current directory for the object file
   directories of the specified machine type(s) and deletes them
 
+Note:
+can also use '-current' for the current value of \$WM_OPTIONS
+
 USAGE
     exit 1
 }
 
+
 # needs some machine types ... or provide immediate help
 if [ "$#" -lt 1 -o "$1" = "-h" -o "$1" = "-help" ]
 then
     usage
 fi
 
-[ -d lib -a -d src ] || usage "not in the project top level directory"
+[ -d bin -a -d src ] || usage "not in the project top level directory"
-
 
 for machType
 do
+    if [ "$machType" = "-current" ]
+    then
+        machType="$WM_OPTIONS"
+        echo "Using current = $machType"
+        [ -n "$machType" ] || continue
+    fi
+
     echo "Cleaning machine type: $machType"
 
-    find `find . -depth \( -name "Make.[A-Za-z]*" -o -name Make \) -type d -print` \
+    find . -depth \( -name Make -o -name "Make.[A-Za-z]*" \) -type d -print | \
-        -depth \( -type d -name "*$machType" -o -name "*$machType$WM_MPLIB" \) -exec rm -r {} \;
+        xargs -i find '{}' -mindepth 1 -maxdepth 1 \
+           \( -type d -name "*$machType" -o -name "*$machType$WM_MPLIB" \) -print |
+        xargs rm -rf
 
-    # find . -depth -type d \( -name ii_files -o -name Templates.DB \) -exec rm -rf {} \;
+    rm -rf platforms/$machType
-
-    for dir in lib/$machType bin/$machType applications/bin/$machType
-    do
-        [ -d $dir ] && rm -rf $dir
-    done
 
 done
 

wmake/wmake

@@ -3,7 +3,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #-------------------------------------------------------------------------------
 # License
@@ -32,6 +32,7 @@
 Script=${0##*/}
 
 usage() {
+    exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 

wmake/wmakePrintBuild

@@ -29,6 +29,9 @@
 #     Print the version used when building the project
 #
 #------------------------------------------------------------------------------
+# persistent build tag
+build="$WM_PROJECT_DIR/.build"
+
 usage() {
     exec 1>&2
 
@@ -41,6 +44,7 @@ options:
   -major          report \$WM_PROJECT_VERSION only and exit
   -update         update \$WM_PROJECT_DIR/.build from the git information
   -pkg TAG        specify packager/release tag ('none' marks an empty packager)
+  -short          report short version information (ie, without pkg tag)
   -version VER    specify an alternative version
 
 Print the version used when building the project, in this order of precedence:
@@ -53,7 +57,7 @@ USAGE
 }
 #------------------------------------------------------------------------------
 
-unset checkOnly update package version oldPackage oldVersion
+unset checkOnly update package version shortOpt
 
 # parse options
 while [ "$#" -gt 0 ]
@@ -76,10 +80,14 @@ do
         ;;
     -pkg | -package)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        # mark empty as 'none', disallow '!' and spaces in string
+        # mark empty as 'none', disallow '!' in string
-        package=$(echo "${2:-none}" | sed -e 's/!//g' -e 's/ //g')
+        package=$(echo "${2:-none}" | sed -e 's/!//g')
         shift 2
         ;;
+    -short)
+        shortOpt=true
+        shift
+        ;;
     -v | -version)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         version="$2"
@@ -93,17 +101,11 @@ done
 
 #------------------------------------------------------------------------------
 
-#
-# persistent build tag
-#
-build="$WM_PROJECT_DIR/.build"
-
-unset oldVersion oldPackage
-
 #
 # retrieve old values from the $WM_PROJECT_DIR/.build cache, stored as
 #     version [packager]
 #
+unset oldPackage oldVersion
 getOldValues()
 {
     set -- $(tail -1 $build 2>/dev/null)
@@ -157,6 +159,11 @@ fi
 # retrieve old values
 getOldValues
 
+if [ "$shortOpt" = true ]
+then
+    unset package oldPackage
+fi
+
 #
 # update persistent build tag if possible
 #
@@ -171,6 +178,14 @@ then
     fi
 fi
 
+# cat<< DEBUG 1>&2
+# Debug information
+#     version='$version'
+#     package='$package'
+#     oldVersion='$oldVersion'
+#     oldPackage='$oldPackage'
+# DEBUG
+
 
 # check git vs. persistent build tag
 if [ -n "$checkOnly" ]