From 7c3ab7620b9ab1d7a3da07c5c97e0bd5bdc693cf Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 23 Jul 2009 20:26:40 +0200
Subject: [PATCH 01/15] new script - foamEtcFile

- Locate user/site/shipped file with the semantics used in the
  ~OpenFOAM/fileName expansion
---
 ReleaseNotes-1.6 |  15 ++---
 bin/foamEtcFile  | 143 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 151 insertions(+), 7 deletions(-)
 create mode 100755 bin/foamEtcFile

diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6
index b18ce5659a..7b6a086e92 100644
--- a/ReleaseNotes-1.6
+++ b/ReleaseNotes-1.6
@@ -396,13 +396,13 @@
     + =addSubtract= - simple add/subtract field functionality
 
 ** Usage
-  + =timeSelector= can now combine =-time ranges= and =-latestTime= options
-    (e.g. -time '0.01:0.09', -time '0.01:').  More reliable behaviour for cases
-    missing /constant// or /0// directories. When the =-noZero= option is
-    enabled, =-latestTime= will not select the =0/= directory unless the
-    =-zeroTime= option is given.  This helps avoid ill effects caused by
-    accidentally using the /0// directory in certain utilities (eg,
-    =reconstructPar=).
+  + =timeSelector= can now combine =-time ranges= and =-latestTime= options.
+    For example, -time '0.01:0.09' -latestTime vs. -time '0.01:'.
+    More reliable behaviour for cases missing /constant// or /0// directories.
+    When the =-noZero= option is enabled, =-latestTime= will not select the
+    =0/= directory unless the =-zeroTime= option is given.
+    This helps avoid ill effects caused by accidentally using the
+    /0// directory in certain utilities (eg, =reconstructPar=).
   + =-region= option added to more utilities.
 
 ** Improvements to Paraview reader module
@@ -412,3 +412,4 @@
     region. A *new* =-touch= option to generate the /.OpenFOAM/ file only.
     Only creates (and removes) /.OpenFOAM/ files if they didn't already
     exist, which is useful in connection with the =-touch= option.
+
diff --git a/bin/foamEtcFile b/bin/foamEtcFile
new file mode 100755
index 0000000000..e3faab4121
--- /dev/null
+++ b/bin/foamEtcFile
@@ -0,0 +1,143 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#-------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     foamEtcFile
+#
+# Description
+#     Locate user/site/shipped file with the semantics used in the
+#     ~OpenFOAM/fileName expansion
+#
+#-------------------------------------------------------------------------------
+unset listOpt quietOpt
+
+usage() {
+    [ "$quietOpt" = true ] && exit 1
+
+    exec 1>&2
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} [OPTION] fileName
+       ${0##*/} -list
+
+options:
+  -l | -list    list the directories to be searched
+  -q | -quiet   suppress all normal output
+
+  Locate user/site/shipped file with the semantics used in the
+  ~OpenFOAM/fileName expansion
+
+  Exit status 0 when the file is found and output resolved path to stdout.
+  Exit status 1 for miscellaneous errors.
+  Exit status 2 when the file is not found.
+
+USAGE
+    exit 1
+}
+
+
+# parse options
+while [ "$#" -gt 0 ]
+do
+    case "$1" in
+    -h | -help)
+        usage
+        ;;
+    -l | -list)
+        listOpt=true
+        shift
+        ;;
+    -q | -quiet)
+        quietOpt=true
+        shift
+        ;;
+    -*)
+        usage "unknown option: '$*'"
+        ;;
+    *)
+        break
+        ;;
+    esac
+done
+
+
+# Save the essential bits of information:
+nArgs=$#
+fileName="$1"
+
+# The various places to be searched:
+set -- \
+    $HOME/.${WM_PROJECT:-OpenFOAM}/$WM_PROJECT_VERSION \
+    $HOME/.${WM_PROJECT:-OpenFOAM} \
+    $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION \
+    $WM_PROJECT_INST_DIR/site \
+    $WM_PROJECT_DIR/etc
+
+
+#
+# The main routine
+#
+
+if [ "$listOpt" = true ]
+then
+
+    # list directories, or potential file locations
+    [ "$nArgs" -le 1 ] || usage
+
+    # a silly combination, but -quiet has precedence
+    [ "$quietOpt" = true ] && exit 0
+
+    for dir
+    do
+        if [ "$nArgs" -eq 1 ]
+        then
+            echo "$dir/$fileName"
+        else
+            echo "$dir"
+        fi
+    done
+    exit 0
+
+else
+
+    [ "$nArgs" -eq 1 ] || usage
+
+    for dir
+    do
+        if [ -f "$dir/$fileName" ]
+        then
+            [ "$quietOpt" = true ] || echo "$dir/$fileName"
+            exit 0
+        fi
+    done
+
+fi
+
+
+# general error, eg file not found
+exit 2
+
+#------------------------------------------------------------------------------

From 2ec89083770587adff04b79f976355cd4abebcd3 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 23 Jul 2009 22:46:52 +0200
Subject: [PATCH 02/15] bugfix PackedList for non-optimized compilation

- use shift-right instead of shift-left formulation to avoid wrong behaviour
  with non-optimized compilation when the packed items fit exactly in the
  available number of bits.
---
 applications/test/PackedList/Make/options     |  7 ++
 applications/test/PackedList/PackedListTest.C | 88 +++++++++++++++++--
 .../containers/Lists/PackedList/PackedList.C  | 26 +++---
 .../containers/Lists/PackedList/PackedListI.H | 11 ++-
 4 files changed, 108 insertions(+), 24 deletions(-)

diff --git a/applications/test/PackedList/Make/options b/applications/test/PackedList/Make/options
index e69de29bb2..42da6e3418 100644
--- a/applications/test/PackedList/Make/options
+++ b/applications/test/PackedList/Make/options
@@ -0,0 +1,7 @@
+/*
+  check for consistent behaviour with non-optimized code
+  */
+
+EXE_INC = \
+    -DFULLDEBUG -g -O0
+
diff --git a/applications/test/PackedList/PackedListTest.C b/applications/test/PackedList/PackedListTest.C
index 0c8528bd1c..9bf29923fe 100644
--- a/applications/test/PackedList/PackedListTest.C
+++ b/applications/test/PackedList/PackedListTest.C
@@ -34,9 +34,46 @@ Description
 #include "IOstreams.H"
 #include "IFstream.H"
 #include "PackedBoolList.H"
+#include <climits>
+
 
 using namespace Foam;
 
+template<unsigned nBits>
+inline void reportInfo()
+{
+    unsigned offset = PackedList<nBits>::packing();
+
+    unsigned useSHL = ((1u << (nBits * offset)) - 1);
+    unsigned useSHR = (~0u >> (sizeof(unsigned)*CHAR_BIT - nBits * offset));
+
+    Info<< nl
+        << "PackedList<" << nBits << ">" << nl
+        << " max_value: " << PackedList<nBits>::max_value() << nl
+        << " packing: " << PackedList<nBits>::packing() << nl
+        << " utilization: " << (nBits * offset) << nl;
+
+    Info<< " Masking:" << nl
+        << "  shift << " << unsigned(nBits * offset) << nl
+        << "  shift >> " << unsigned((sizeof(unsigned)*CHAR_BIT) - nBits * offset)
+        << nl;
+
+    hex(Info);
+    Info<< "   maskLower: " << PackedList<nBits>::maskLower(PackedList<nBits>::packing())
+        << nl
+        << "      useSHL: " << useSHL << nl
+        << "      useSHR: " << useSHR << nl;
+
+    if (useSHL != useSHR)
+    {
+        Info<< "WARNING:  different results for SHL and SHR" << nl;
+    }
+
+    Info<< nl;
+    dec(Info);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 //  Main program:
 
@@ -45,16 +82,56 @@ int main(int argc, char *argv[])
     argList::noParallel();
     argList::validArgs.insert("file .. fileN");
 
+    argList::validOptions.insert("mask", "");
     argList::validOptions.insert("count", "");
     argList::validOptions.insert("info", "");
 
     argList args(argc, argv, false, true);
 
-    if (args.additionalArgs().empty())
+
+    if (args.optionFound("mask"))
+    {
+        Info<< "bit width: " << unsigned(sizeof(unsigned)*CHAR_BIT) << endl;
+        reportInfo<1>();
+        reportInfo<2>();
+        reportInfo<3>();
+        reportInfo<4>();
+        reportInfo<5>();
+        reportInfo<6>();
+        reportInfo<7>();
+        reportInfo<8>();
+        reportInfo<9>();
+        reportInfo<10>();
+        reportInfo<11>();
+        reportInfo<12>();
+        reportInfo<13>();
+        reportInfo<14>();
+        reportInfo<15>();
+        reportInfo<16>();
+        reportInfo<17>();
+        reportInfo<18>();
+        reportInfo<19>();
+        reportInfo<20>();
+        reportInfo<21>();
+        reportInfo<22>();
+        reportInfo<23>();
+        reportInfo<24>();
+        reportInfo<25>();
+        reportInfo<26>();
+        reportInfo<27>();
+        reportInfo<28>();
+        reportInfo<29>();
+        reportInfo<30>();
+        reportInfo<31>();
+
+        return 0;
+    }
+    else if (args.additionalArgs().empty())
     {
         args.printUsage();
     }
 
+
     forAll(args.additionalArgs(), argI)
     {
         const string& srcFile = args.additionalArgs()[argI];
@@ -62,6 +139,7 @@ int main(int argc, char *argv[])
 
         IFstream ifs(srcFile);
         List<label> rawLst(ifs);
+
         PackedBoolList packLst(rawLst);
 
         Info<< "size: " << packLst.size() << nl;
@@ -72,11 +150,11 @@ int main(int argc, char *argv[])
             forAll(rawLst, elemI)
             {
                 if (rawLst[elemI])
-                {                    
+                {
                     rawCount++;
-                }                
+                }
             }
-            Info<< "raw count: " << rawCount << nl            
+            Info<< "raw count: " << rawCount << nl
                 << "packed count: " << packLst.count() << nl;
         }
 
@@ -84,7 +162,7 @@ int main(int argc, char *argv[])
         {
             packLst.print(Info);
         }
-        
+
         Info<< nl;
         IOobject::writeDivider(Info);
     }
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
index 87ced9504f..ecf64f861a 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedList.C
@@ -204,19 +204,15 @@ Foam::Ostream& Foam::PackedList<nBits>::iteratorBase::print(Ostream& os) const
 template<unsigned nBits>
 Foam::Ostream& Foam::PackedList<nBits>::print(Ostream& os) const
 {
-    os  << "PackedList<" << label(nBits) << ">"
+    const label packLen = packedLength(size_);
+
+    os  << "PackedList<" << nBits << ">"
         << " max_value:" << max_value()
         << " packing:"   << packing() << nl
-        << "values: " << size_ << "/" << capacity() << "( ";
-    forAll(*this, i)
-    {
-        os << get(i) << ' ';
-    }
-
-    label packLen = packedLength(size_);
-
-    os  << ")\n"
-        << "storage: " << packLen << "/" << StorageList::size() << "( ";
+        << " count: "     << count() << nl
+        << " size/capacity: " << size_ << "/" << capacity() << nl
+        << " storage/capacity: " << packLen << "/" << StorageList::size()
+        << "\n(\n";
 
     // mask value for complete segments
     unsigned int mask = maskLower(packing());
@@ -240,7 +236,7 @@ Foam::Ostream& Foam::PackedList<nBits>::print(Ostream& os) const
             }
         }
 
-        for (unsigned int testBit = (1 << max_bits()); testBit; testBit >>= 1)
+        for (unsigned int testBit = (1u << max_bits()); testBit; testBit >>= 1)
         {
             if (mask & testBit)
             {
@@ -250,15 +246,15 @@ Foam::Ostream& Foam::PackedList<nBits>::print(Ostream& os) const
                 }
                 else
                 {
-                    os << '0';
+                    os << '-';
                 }
             }
             else
             {
-                os << '.';
+                os << 'x';
             }
         }
-        cout << ' ';
+        os << '\n';
     }
     os << ")\n";
 
diff --git a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
index 711ed03db6..df7786f61b 100644
--- a/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
+++ b/src/OpenFOAM/containers/Lists/PackedList/PackedListI.H
@@ -40,7 +40,7 @@ inline unsigned int Foam::PackedList<nBits>::max_bits()
 template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::max_value()
 {
-    return (1 << nBits) - 1;
+    return (1u << nBits) - 1;
 }
 
 
@@ -54,7 +54,10 @@ inline unsigned int Foam::PackedList<nBits>::packing()
 template<unsigned nBits>
 inline unsigned int Foam::PackedList<nBits>::maskLower(unsigned offset)
 {
-    return (1 << (nBits * offset)) - 1;
+    // return (1u << (nBits * offset)) - 1;
+    // The next one works more reliably with overflows
+    // eg, when compiled without optimization
+    return (~0u >> ( sizeof(StorageType)*CHAR_BIT - nBits * offset));
 }
 
 
@@ -581,7 +584,7 @@ inline void Foam::PackedList<nBits>::resize
             if (fill & ~max_value())
             {
                 // overflow is max_value, fill everything
-                fill = ~0;
+                fill = ~0u;
             }
             else
             {
@@ -847,7 +850,7 @@ inline void Foam::PackedList<nBits>::operator=(const unsigned int val)
         if (fill & ~max_value())
         {
             // treat overflow as max_value
-            fill = ~0;
+            fill = ~0u;
         }
         else
         {

From ab918fba9bda3670b3306cfc8db06de0e48d00f1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 23 Jul 2009 23:53:32 +0200
Subject: [PATCH 03/15] introduce fileName::clean() method

- still needs more fleshing out, but introduce the method for now and
  add more code later (without recompiling everything else).
---
 src/OpenFOAM/global/argList/argList.C         |  3 +--
 .../primitives/strings/fileName/fileName.C    | 21 +++++++++++++++++++
 .../primitives/strings/fileName/fileName.H    |  7 +++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 01feb13dfc..37caa6ddb3 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -127,8 +127,7 @@ void Foam::argList::getRootCase()
     if (iter != options_.end())
     {
         casePath = iter();
-        casePath.removeRepeated('/');
-        casePath.removeTrailing('/');
+        casePath.clean();
 
         // handle degenerate form and '-case .' like no -case specified
         if (casePath.empty() || casePath == ".")
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 6d930e9fe8..ac6dc75025 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -55,6 +55,27 @@ Foam::fileName::Type Foam::fileName::type() const
 }
 
 
+bool Foam::fileName::clean()
+{
+    bool changed = false;
+
+    changed = this->removeRepeated('/') || changed;
+    changed = this->removeTrailing('/') || changed;
+
+    return changed;
+}
+
+
+// Return string with repeated characters removed
+Foam::fileName Foam::fileName::clean() const
+{
+    fileName fName(*this);
+    fName.clean();
+    return fName;
+}
+
+
+
 //  Return file name (part beyond last /)
 //
 //  behaviour compared to /usr/bin/basename:
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.H b/src/OpenFOAM/primitives/strings/fileName/fileName.H
index a47f53ed80..709e70920b 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.H
@@ -128,6 +128,13 @@ public:
         //- Is this character valid for a fileName?
         inline static bool valid(char);
 
+        //- Cleanup file name
+        //  eg, remove repeated slashes, etc.
+        bool clean();
+
+        //- Cleanup file name
+        //  eg, remove repeated slashes, etc.
+        fileName clean() const;
 
         // Interogation
 

From b095d7849603477d570946965e6bc0a9080bd8b1 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 24 Jul 2009 08:46:32 +0200
Subject: [PATCH 04/15] drop bin/tools/foamThirdParty (unused) in favour of
 straight text form

- doc/THIRD_PARTY lists where various third party sources can be found
---
 bin/tools/foamThirdParty | 398 ---------------------------------------
 doc/THIRD_PARTY          |  35 ++++
 2 files changed, 35 insertions(+), 398 deletions(-)
 delete mode 100755 bin/tools/foamThirdParty
 create mode 100644 doc/THIRD_PARTY

diff --git a/bin/tools/foamThirdParty b/bin/tools/foamThirdParty
deleted file mode 100755
index 0df42920c7..0000000000
--- a/bin/tools/foamThirdParty
+++ /dev/null
@@ -1,398 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use File::Spec;
-use Getopt::Long;
-
-#############################################################################
-# SETTINGS
-#
-my %config = (
-    thirdParty => "$ENV{WM_PROJECT_INST_DIR}/ThirdParty",
-    project    => ( $ENV{WM_PROJECT} || '' ) . "-"
-      . ( $ENV{WM_PROJECT_VERSION} || '' ),
-);
-
-my %packages = (
-    cmake => {
-        -opt => 1,
-        url  => "http://www.cmake.org/files/v2.6/cmake-2.6.0.tar.gz",
-    },
-
-    lam => {
-        -opt => 1,
-        url  => "http://www.lam-mpi.org/download/files/lam-7.1.4.tar.bz2",
-    },
-
-    libccmio => {
-        -opt => 1,
-        url  =>
-          "https://wci.llnl.gov/codes/visit/3rd_party/libccmio-2.6.1.tar.gz",
-    },
-
-    openmpi => {
-        url =>
-"http://www.open-mpi.org/software/ompi/v1.2/downloads/openmpi-1.2.6.tar.bz2",
-    },
-
-    metis => {
-        url =>
-          "http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.0pre2.tar.gz"
-    },
-    mico => {
-        -opt => 1,
-        url  => "http://www.mico.org/mico-2.3.12.tar.gz",
-    },
-
-    mpich => {
-        -opt => 1,
-        url  => "ftp://ftp.mcs.anl.gov/pub/mpi/old/mpich-1.2.4.tar.gz",
-    },
-
-    ParMetis => {
-        url =>
-"http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/ParMetis-3.1.tar.gz",
-    },
-
-    ParMGridGen => {
-        url =>
-"http://www-users.cs.umn.edu/~moulitsa/download/ParMGridGen-1.0.tar.gz",
-    },
-
-    zlib => { url => "http://www.zlib.net/zlib-1.2.3.tar.gz", },
-
-    hoard => {
-        -opt => 1,
-        url  =>
-          "http://www.cs.umass.edu/%7Eemery/hoard/hoard-3.7.1/hoard-371.tar.gz"
-    },
-
-##    # this really doesn't work well, but code needs minor patching anyhow:
-##    fbsdmalloc => {
-##        url =>
-##        "http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/lib/libc/stdlib/malloc.c?rev=1.171",
-##
-##    },
-);
-
-#
-# END OF SETTINGS
-############################################################################
-
-( my $Script = $0 ) =~ s{^.*/}{};
-
-# --------------------------------------------------------------------------
-sub usage {
-    my ( @req, @opt );
-
-    for ( sort keys %packages ) {
-        if ( $packages{$_}{-opt} ) {
-            push @opt, $_;
-        }
-        else {
-            push @req, $_;
-        }
-    }
-
-    $! = 0;    # clean exit
-    warn "@_\n" if @_;
-    die <<"USAGE";
-usage:
-    $Script [OPTION] [package1 .. packageN]
-
-options:
-  -help     usage
-  -status   show status  [default]
-  -list     list versions and resource locations
-  -version  list versions only
-  -dir      list unpack directory
-  -reldir   list unpack directory relative to cwd
-  -get      get packages as required (uses curl)
-  -unpack   unpack packages where required and possible
-
-Simple management of 3rd party software for '$config{project}'
-using the directory
-    $config{thirdParty}
-
-Packages:  @req
-Optional:  @opt
-
-Return codes:
-  -status -get -unpack   number of missing packages or errors
-
-USAGE
-}
-
-# --------------------------------------------------------------------------
-my %opt;
-
-# default action is -status
-@ARGV or $opt{status}++;
-GetOptions(
-    \%opt,    ##
-    "help",   "status", "list", "version", "dir",
-    "reldir", "get",    "unpack",
-  )
-  or usage;
-
-$opt{help} and usage;
-
--d $config{thirdParty} or usage "ERROR: no '$config{thirdParty}' dir";
-
-#
-# complete the config
-#
-if ( not exists $config{sources} ) {
-    $config{sources} = "$config{thirdParty}/sources";
-    -d $config{sources} or mkdir $config{sources};
-}
-
-#
-# cleanup the packages table
-#
-for my $name ( keys %packages ) {
-    my $href = $packages{$name};
-
-    if ( not $href->{url} ) {
-        warn "$name without url\n";
-        delete $packages{$name};
-        next;
-    }
-
-    if ( not exists $href->{file} ) {
-        ( $href->{file} = $href->{url} ) =~ s{^.*/|\?.*$}{}g;
-    }
-
-    if ( not exists $href->{dir} ) {
-        ( $href->{dir} = $href->{file} ) =~ s{\.(zip|tar(\.(gz|bz2))?)$}{};
-    }
-}
-
-#
-# check for names in the packages
-#
-sub selectNames {
-    my @names;
-    my $req;
-
-    while ( @_ and $_[0] =~ /^-/ ) {
-        my $opt = shift;
-        if ( $opt =~ /^-req/ ) {
-            $req++;
-        }
-    }
-
-    if (@_) {
-        my ( %seen, @reject );
-        for my $name (@_) {
-            next if $seen{$name}++;
-            if ( exists $packages{$name} ) {
-                push @names, $name;
-            }
-            else {
-                push @reject, $name;
-            }
-        }
-
-        usage "unknown package(s): @reject" if @reject;
-    }
-    else {
-        @names =
-          grep { not $req or not $packages{$_}{-opt} } sort keys %packages;
-    }
-
-    @names or usage "no packages";
-
-    return @names;
-}
-
-#
-# list the current status
-#
-if ( $opt{status} ) {
-    my @names = selectNames @ARGV;
-
-    my $nMissing = 0;
-
-    for my $name (@names) {
-        my $href = $packages{$name};
-        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
-
-        my @status;
-        if ( -e "$config{sources}/$file" ) {
-            push @status, "  packed: $config{sources}/$file";
-        }
-
-        if ( -d "$config{thirdParty}/$dir" ) {
-            push @status, "unpacked: $config{thirdParty}/$dir";
-        }
-
-        unless (@status) {
-            $nMissing++;
-            @status = "missing";
-        }
-
-        for (@status) {
-            printf "%-16s %-16s %s", $name, $dir, $_;
-
-            if ( $href->{-opt} ) {
-                print "  [optional]";
-            }
-            print "\n";
-        }
-    }
-
-    exit $nMissing;
-}
-
-#
-# show an overview of the versions and the resource locations
-#
-if ( $opt{list} ) {
-    my @names = selectNames @ARGV;
-
-    for my $name (@names) {
-        my $href = $packages{$name};
-        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
-
-        printf "%-16s %-16s %s", $name, $dir, $url;
-        if ( $href->{-opt} ) {
-            print "  [optional]";
-        }
-        print "\n";
-
-    }
-
-    exit 0;
-}
-
-#
-# show the version (directory name) only
-#
-if ( $opt{version} ) {
-    my @names = selectNames @ARGV;
-
-    for my $name (@names) {
-        my $href = $packages{$name};
-        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
-
-        print $dir, "\n";
-    }
-
-    exit 0;
-}
-
-#
-# show the unpack directory name
-#
-if ( $opt{dir} or $opt{reldir} ) {
-    my @names = selectNames @ARGV;
-    my $base  = $config{thirdParty};
-
-    if ( $opt{reldir} ) {
-        $base = File::Spec->abs2rel($base);
-        length $base or $base = '.';
-    }
-
-    for my $name (@names) {
-        my $href = $packages{$name};
-        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
-
-        print File::Spec->catfile( $base, $dir ), "\n";
-    }
-
-    exit 0;
-}
-
-#
-# get and/or unpack packages as required and possible
-# avoid getting/unpacking optional packages
-#
-if ( $opt{get} or $opt{unpack} ) {
-    my @names = selectNames -required => @ARGV;
-
-    my $nError = 0;
-
-    for my $name (@names) {
-        my $href = $packages{$name};
-        my ( $dir, $file, $url ) = @$href{qw( dir file url )};
-
-        my $flags = "";
-        if ( $href->{-opt} ) {
-            $flags .= "[optional]";
-        }
-
-        warn '-' x 70, "\n", "$name  ($dir)  $flags\n";
-
-        if ( -d "$config{thirdParty}/$dir" ) {
-            warn "unpacked: $config{thirdParty}/$dir\n";
-            next;
-        }
-
-        if ( $opt{get} ) {
-            if ( -e "$config{sources}/$file" ) {
-                warn "  packed: $config{sources}/$file\n";
-            }
-            else {
-                my $fetch = "curl -k -o $file";
-
-                # curl seems to hang on anonymous ftp?
-                if ( $url =~ /^ftp:/ ) {
-                    $fetch = "wget -v";
-                }
-
-                system "set -x; cd $config{sources} && $fetch $url";
-
-                if ( not -e "$config{sources}/$file" ) {
-                    $nError++;
-                    warn "  download failed!?\n";
-                    next;
-                }
-            }
-        }
-
-        if ( $opt{unpack} ) {
-            if ( -e "$config{sources}/$file" ) {
-                my $unpack;
-                if ( $file =~ m{\.zip$} ) {
-                    $unpack = "unzip";
-                }
-                elsif ( $file =~ m{\.tar$} ) {
-                    $unpack = "tar -xf";
-                }
-                elsif ( $file =~ m{\.tar\.bz2$} ) {
-                    $unpack = "tar -xjf";
-                }
-                elsif ( $file =~ m{\.(tgz|tar\.gz)$} ) {
-                    $unpack = "tar -xzf";
-                }
-                else {
-                    $nError++;
-                    warn "  no unpack defined for $file\n";
-                    next;
-                }
-
-                system
-"set -x; cd $config{thirdParty} && $unpack $config{sources}/$file";
-
-                # catch isolated cases where it unpacks without a version number
-                if ( -d "$config{thirdParty}/$name"
-                    and not -d "$config{thirdParty}/$dir" )
-                {
-                    rename "$config{thirdParty}/$name",
-                      "$config{thirdParty}/$dir";
-                }
-
-                unless ( -d "$config{thirdParty}/$dir" ) {
-                    $nError++;
-                    warn "unpack failed!?\n";
-                    next;
-                }
-            }
-        }
-    }
-
-    warn '-' x 70, "\n\n";
-    exit $nError;
-}
-
-# --------------------------------------------------------------------------
diff --git a/doc/THIRD_PARTY b/doc/THIRD_PARTY
new file mode 100644
index 0000000000..17f654c450
--- /dev/null
+++ b/doc/THIRD_PARTY
@@ -0,0 +1,35 @@
+# A brief listing of some third party sources
+
+# --------------------------------------------------------------------------
+# compiler
+gcc         http://gcc.gnu.org/gcc-4.3/
+mpfr        http://www.mpfr.org/
+gmp         http://gmplib.org/
+
+# --------------------------------------------------------------------------
+# Parallel processing
+
+openmpi     http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-1.3.3.tar.bz2
+metis       http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.0pre2.tar.gz
+ParMetis    http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/ParMetis-3.1.tar.gz
+ParMGridGen http://www-users.cs.umn.edu/~moulitsa/download/ParMGridGen-1.0.tar.gz
+mpich       ftp://ftp.mcs.anl.gov/pub/mpi/old/mpich-1.2.4.tar.gz
+scotch      http://gforge.inria.fr/frs/download.php/22247/scotch_5.1.6.tar.gz
+
+# --------------------------------------------------------------------------
+# Allocation
+
+hoard       http://www.cs.umass.edu/%7Eemery/hoard/hoard-3.7.1/hoard-371.tar.gz
+
+-> Note: the code needs minor patching
+fbsdmalloc  http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/lib/libc/stdlib/malloc.c?rev=1.171
+
+# --------------------------------------------------------------------------
+# Misc
+
+cmake       http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz#
+paraview    http://www.paraview.org/files/v3.6/paraview-3.6.1.tar.gz
+libccmio    https://wci.llnl.gov/codes/visit/3rd_party/libccmio-2.6.1.tar.gz
+zlib        http://www.zlib.net/zlib-1.2.3.tar.gz
+
+# --------------------------------------------------------------------------

From b1a3bcc9a9675d1fd4067960a8749e0fc4a59571 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 24 Jul 2009 11:01:29 +0200
Subject: [PATCH 05/15] take control of Allwmake scripts for third-party
 sources

- this improves the chances of having a current version
---
 Allwmake                                      |   3 +-
 .../mesh/conversion/Optional/Allwmake         |   3 +-
 bin/tools/AllwcleanThirdParty                 |  50 +++++
 bin/tools/AllwmakeLibccmio                    |  70 +++++++
 bin/tools/AllwmakeThirdParty                  | 194 ++++++++++++++++++
 bin/tools/makeGcc                             | 142 +++++++++++++
 bin/tools/makeQT                              |  73 +++++++
 7 files changed, 532 insertions(+), 3 deletions(-)
 create mode 100755 bin/tools/AllwcleanThirdParty
 create mode 100755 bin/tools/AllwmakeLibccmio
 create mode 100755 bin/tools/AllwmakeThirdParty
 create mode 100755 bin/tools/makeGcc
 create mode 100755 bin/tools/makeQT

diff --git a/Allwmake b/Allwmake
index ca2113e522..27dce3b858 100755
--- a/Allwmake
+++ b/Allwmake
@@ -6,8 +6,9 @@ set -x
 ( cd wmake/src && make )
 
 # build ThirdParty sources
-( cd $WM_THIRD_PARTY_DIR && ./Allwmake )
+$WM_PROJECT_DIR/bin/tools/AllwmakeThirdParty
 
+# build OpenFOAM libraries and applications
 src/Allwmake
 applications/Allwmake
 
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index ae71b400fa..e0a4e315da 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -5,9 +5,8 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-
 # build libccmio and create lnInclude directory
-( cd $WM_THIRD_PARTY_DIR && ./AllwmakeLibccmio )
+$WM_PROJECT_DIR/bin/tools/AllwmakeLibccmio
 
 # if the library built properly, the headers should exist too
 if [ -e $FOAM_LIBBIN/libccmio.so ]
diff --git a/bin/tools/AllwcleanThirdParty b/bin/tools/AllwcleanThirdParty
new file mode 100755
index 0000000000..6b233f92c6
--- /dev/null
+++ b/bin/tools/AllwcleanThirdParty
@@ -0,0 +1,50 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     AllwcleanThirdParty
+#
+# Description
+#     Distribution clean script for ThirdParty
+#
+#     Still somewhat incomplete
+#------------------------------------------------------------------------------
+[ -d "$WM_THIRD_PARTY_DIR" ] || {
+    echo "no \$WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
+    exit 1
+}
+
+cd $WM_THIRD_PARTY_DIR || exit 1    # run from third-party directory
+set -x
+
+rm -rf gcc-4.3.3/build
+rm -rf gmp-4.2.4/build
+rm -rf mpfr-2.4.1/build
+
+( cd metis-5.0pre2 && make distclean )
+( cd openmpi-1.3.3 && make distclean )
+( cd paraview-3.6.1 && make distclean )
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/AllwmakeLibccmio b/bin/tools/AllwmakeLibccmio
new file mode 100755
index 0000000000..c4b9d63d3c
--- /dev/null
+++ b/bin/tools/AllwmakeLibccmio
@@ -0,0 +1,70 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     AllwmakeLibccmio
+#
+# Description
+#     Get and build CD-adapco's ccmio library
+#
+#------------------------------------------------------------------------------
+packageDir=libccmio-2.6.1
+
+[ -d "$WM_THIRD_PARTY_DIR" ] || {
+    echo "no \$WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
+    exit 1
+}
+
+cd $WM_THIRD_PARTY_DIR || exit 1    # run from third-party directory
+set -x
+
+if [ ! -d ${packageDir} ]
+then
+    if [ ! -e ${packageDir}.tar.gz ]
+    then
+        wget --no-check-certificate \
+            https://wci.llnl.gov/codes/visit/3rd_party/${packageDir}.tar.gz
+    fi
+
+     if [ -e ${packageDir}.tar.gz ]
+     then
+         tar -xzf ${packageDir}.tar.gz
+     else
+         echo "no ${packageDir}.tar.gz to unpack"
+     fi
+fi
+
+if [ -d ${packageDir} -a ! -d ${packageDir}/Make ]
+then
+    cp -r wmakeFiles/libccmio ${packageDir}/Make
+fi
+
+if [ -d ${packageDir}/Make ]
+then
+    wmake libso ${packageDir}
+fi
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/AllwmakeThirdParty b/bin/tools/AllwmakeThirdParty
new file mode 100755
index 0000000000..83d4746a07
--- /dev/null
+++ b/bin/tools/AllwmakeThirdParty
@@ -0,0 +1,194 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     AllwmakeThirdParty
+#
+# Description
+#     Build script for ThirdParty sources
+#
+#------------------------------------------------------------------------------
+
+[ -d "$WM_THIRD_PARTY_DIR" ] || {
+    echo "no \$WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
+    exit 1
+}
+
+cd $WM_THIRD_PARTY_DIR || exit 1    # run from third-party directory
+set -x
+
+
+# export WM settings in a form that GNU configure recognizes
+[ -n "$WM_CC" ]         &&  export CC="$WM_CC"
+[ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
+[ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
+[ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
+[ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
+
+wmake libso zlib-1.2.3
+( cd malloc && ./Allwmake )
+
+#
+# compile specific mpi libraries
+#
+case "$WM_MPLIB" in
+OPENMPI)
+    if [ -r $MPI_ARCH_PATH/lib/libmpi.so ]
+    then
+        echo "have $WM_MPLIB shared library"
+    elif [ -r $MPI_ARCH_PATH/lib/libmpi.a ]
+    then
+        echo "have $WM_MPLIB static library"
+    else
+    (
+        cd $MPI_HOME || exit
+
+        make distclean
+        rm -rf $MPI_ARCH_PATH
+
+        unset mpiWith
+        # as of version 1.3, enable GridEngine
+        if [ -n "$SGE_ROOT" ]
+        then
+            mpiWith="$mpiWith --with-sge"
+        fi
+
+        # Infiniband support
+        # if [ -d /usr/local/ofed -a -d /usr/local/ofed/lib64 ]
+        # then
+        #     mpiWith="$mpiWith --with-openib=/usr/local/ofed"
+        #     mpiWith="$mpiWith --with-openib-libdir=/usr/local/ofed/lib64"
+        # fi
+
+        ./configure \
+            --prefix=$MPI_ARCH_PATH \
+            --disable-mpirun-prefix-by-default \
+            --disable-orterun-prefix-by-default \
+            --enable-shared --disable-static \
+            --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
+            --disable-mpi-profile \
+            $mpiWith \
+            ;
+
+        make
+        make install
+        make distclean
+    )
+    fi
+    ;;
+
+MPICH)
+    if [ -r $MPI_ARCH_PATH/lib/libmpich.so ]
+    then
+        echo "have $WM_MPLIB shared library"
+    elif [ -r $MPI_ARCH_PATH/lib/libmpich.a ]
+    then
+        echo "have $WM_MPLIB static library"
+    else
+    (
+        cd $MPI_HOME || exit
+
+        make distclean
+        rm -rf $MPI_ARCH_PATH
+        rm util/machines/machines.*
+
+        ./configure \
+            --without-mpe \
+            --disable-f77 \
+            --disable-f90 \
+            --disable-f90modules \
+            --disable-c++ \
+            --disable-mpedbg \
+            --disable-devdebug \
+            --disable-debug \
+            --enable-sharedlib=$MPI_ARCH_PATH/lib \
+            --with-device=ch_p4 \
+            -prefix=$MPI_ARCH_PATH
+        make
+        make install
+        make distclean
+
+        if [ -r $MPI_ARCH_PATH ]
+        then
+            cd $MPI_ARCH_PATH/bin
+            for file in *
+            do
+                sed s%$MPI_ARCH_PATH%'$MPI_ARCH_PATH'%g $file > temp.$$
+                mv temp.$$ $file
+                chmod 0755 $file
+            done
+
+            cd $MPI_ARCH_PATH/lib
+
+            if [ -r libmpich.so.1.0 ]
+            then
+                rm *.so
+                ln -s libmpich.so.1.0 libmpich.so
+            fi
+        fi
+    )
+    fi
+    ;;
+
+esac
+
+# Build Scotch decomposition
+(
+    cd scotch_5.1 || exit
+    wmake libso src/libscotch
+    wmake libso src/libscotchmetis
+)
+
+# Build Metis decomposition
+(
+    cd metis-5.0pre2 || exit
+    wmake libso GKlib
+    wmake libso libmetis
+)
+
+# Build parMetis. Requires MPI!
+if [ -d "$MPI_ARCH_PATH" ]
+then
+(
+    cd ParMetis-3.1 || exit
+    wmake libso METISLib
+    wmake libso ParMETISLib
+)
+fi
+
+
+# Build ParMGridGen
+wmake libso ParMGridGen-1.0/MGridGen/IMlib
+wmake libso ParMGridGen-1.0/MGridGen/Lib
+
+
+set +x
+echo
+echo ==============================
+echo done ThirdParty Allwmake
+echo ==============================
+echo
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/makeGcc b/bin/tools/makeGcc
new file mode 100755
index 0000000000..01d6179f2d
--- /dev/null
+++ b/bin/tools/makeGcc
@@ -0,0 +1,142 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     makeGcc
+#
+# Description
+#     Build script for gmp, mpfr and gcc-4.3.? and gcc-4.4.?
+#
+#------------------------------------------------------------------------------
+
+gmpVERSION=gmp-4.2.4
+mpfrVERSION=mpfr-2.4.1
+gccVERSION="$1"
+
+usage() {
+    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
+    cat<<USAGE
+
+usage: ${0##*/} <gcc-4.?.?> ...
+
+* build gmp, mpfr and gcc-4.3.? and gcc-4.4.?
+
+USAGE
+    exit 1
+}
+
+[ "$#" -eq 1 ] || usage "gcc version not provided"
+
+
+#
+# Set the number of cores to build on
+#
+WM_NCOMPPROCS=1
+
+if [ -r /proc/cpuinfo ]
+then
+    WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
+    [ $WM_NCOMPPROCS -le 8 ] || WM_NCOMPPROCS=8
+fi
+
+echo "Building on " $WM_NCOMPPROCS " cores"
+
+GCC_DIR=$WM_THIRD_PARTY_DIR/$gccVERSION
+GMP_DIR=$WM_THIRD_PARTY_DIR/$gmpVERSION
+MPFR_DIR=$WM_THIRD_PARTY_DIR/$mpfrVERSION
+
+GCCROOT=${GCC_DIR}/platforms/$WM_ARCH$WM_COMPILER_ARCH
+GMPROOT=${GMP_DIR}/platforms/$WM_ARCH$WM_COMPILER_ARCH
+MPFRROOT=${MPFR_DIR}/platforms/$WM_ARCH$WM_COMPILER_ARCH
+
+#
+# Bulid GMP
+#
+if [ ! -d $GMPROOT ]
+then
+(
+       cd $GMP_DIR \
+    && make distclean \
+    && mkdir $GMP_DIR/build \
+    && cd $GMP_DIR/build \
+    && ../configure ABI=$ABI --prefix=$GMPROOT \
+    && make -j $WM_NCOMPPROCS \
+    && make install
+
+    echo "    Finished building gmp."
+)
+else
+    echo "    gmp already built."
+fi
+
+export LD_LIBRARY_PATH="$GMPROOT/lib:$LD_LIBRARY_PATH"
+
+#
+# Build MPFR
+#
+if [ ! -d $MPFRROOT ]
+then
+(
+       cd $MPFR_DIR \
+    && make distclean \
+    && mkdir $MPFR_DIR/build \
+    && cd $MPFR_DIR/build \
+    && ../configure ABI=$ABI --prefix=$MPFRROOT --with-gmp=$GMPROOT \
+    && make -j $WM_NCOMPPROCS  \
+    && make install
+
+    echo "    Finished building mpfr."
+)
+else
+    echo "    mprf already built."
+fi
+
+export LD_LIBRARY_PATH="$MPFRROOT/lib:$LD_LIBRARY_PATH"
+
+#
+# Build GCC
+#
+if [ ! -d $GCCROOT ]
+then
+(
+       cd $GCC_DIR \
+    && make distclean \
+    && mkdir $GCC_DIR/build \
+    && cd $GCC_DIR/build \
+    && ../configure --enable-languages=c,c++ --with-pkgversion='OpenFOAM' \
+           --enable-__cxa_atexit --enable-libstdcxx-allocator=new \
+           --with-system-zlib --prefix=$GCCROOT \
+           --with-mpfr=$MPFRROOT --with-gmp=$GMPROOT \
+    && make -j $WM_NCOMPPROCS \
+    && make install
+
+    echo "    Finished building gcc."
+)
+else
+    echo "    gcc already built."
+fi
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/makeQT b/bin/tools/makeQT
new file mode 100755
index 0000000000..8a4e047072
--- /dev/null
+++ b/bin/tools/makeQT
@@ -0,0 +1,73 @@
+#!/bin/sh
+#------------------------------------------------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software; you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by the
+#     Free Software Foundation; either version 2 of the License, or (at your
+#     option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM; if not, write to the Free Software Foundation,
+#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+#
+# Script
+#     makeQT
+#
+# Description
+#     Build script for Qt-4.3.5
+#
+#------------------------------------------------------------------------------
+
+QT_VERSION=4.3.5
+QT_HOME=${WM_THIRD_PARTY_DIR}/qt-x11-opensource-src-${QT_VERSION}
+QT_ARCH_PATH=${QT_HOME}/platforms/${WM_OPTIONS}
+
+
+if [ ! -d $QT_ARCH_PATH ]
+then
+    cd $QT_HOME || {
+       echo "no Qt sources found"
+       exit 1
+    }
+
+    make distclean
+    rm -rf $QT_ARCH_PATH
+
+    ./configure \
+        --prefix=$QT_ARCH_PATH \
+        -nomake demos \
+        -nomake examples
+
+    if [ -r /proc/cpuinfo ]
+    then
+        WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
+        [ $WM_NCOMPPROCS -le 8 ] || WM_NCOMPPROCS=8
+
+        echo "Building on " $WM_NCOMPPROCS " cores"
+
+        time make -j $WM_NCOMPPROCS
+    else
+        time make
+    fi
+
+    make install
+
+    echo "    Finished building Qt-$QT_VERSION"
+else
+    echo "    Qt-$QT_VERSION already built."
+fi
+
+# ----------------------------------------------------------------- end-of-file

From 91157af10c080f2c9e67ad2f3475ebe3d98ed9be Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Fri, 24 Jul 2009 23:10:15 +0200
Subject: [PATCH 06/15] All ThirdParty build-related stuff moved there.

---
 Allwmake                                      |   2 +-
 README                                        |  97 ++--
 .../mesh/conversion/Optional/Allwmake         |   2 +-
 bin/buildParaView                             | 225 ---------
 bin/buildParaView-python                      |   1 -
 bin/foamTags                                  |  26 +-
 bin/tools/AllwcleanThirdParty                 |  50 --
 bin/tools/AllwmakeLibccmio                    |  70 ---
 bin/tools/AllwmakeThirdParty                  | 194 --------
 bin/tools/buildParaViewFunctions              | 445 ------------------
 bin/tools/makeGcc                             | 142 ------
 bin/tools/makeQT                              |  73 ---
 bin/tools/thirdPartyGetFunctions              |  78 ---
 bin/touchapp                                  |  12 +-
 doc/THIRD_PARTY                               |  35 --
 15 files changed, 76 insertions(+), 1376 deletions(-)
 delete mode 100755 bin/buildParaView
 delete mode 120000 bin/buildParaView-python
 delete mode 100755 bin/tools/AllwcleanThirdParty
 delete mode 100755 bin/tools/AllwmakeLibccmio
 delete mode 100755 bin/tools/AllwmakeThirdParty
 delete mode 100644 bin/tools/buildParaViewFunctions
 delete mode 100755 bin/tools/makeGcc
 delete mode 100755 bin/tools/makeQT
 delete mode 100644 bin/tools/thirdPartyGetFunctions
 delete mode 100644 doc/THIRD_PARTY

diff --git a/Allwmake b/Allwmake
index 27dce3b858..6d98be3b84 100755
--- a/Allwmake
+++ b/Allwmake
@@ -6,7 +6,7 @@ set -x
 ( cd wmake/src && make )
 
 # build ThirdParty sources
-$WM_PROJECT_DIR/bin/tools/AllwmakeThirdParty
+$WM_THIRD_PARTY_DIR/Allwmake
 
 # build OpenFOAM libraries and applications
 src/Allwmake
diff --git a/README b/README
index f6baf20491..b6df934336 100644
--- a/README
+++ b/README
@@ -22,37 +22,37 @@
   If the user wishes to run OpenFOAM in 32/64-bit mode they should consult the
   section "Running OpenFOAM in 32-bit mode".
 
-*** Qt (from http://trolltech.com/products/qt)
-    The ParaView 3.3 visualisation package requires that Qt version 4.3.x MUST
-    be installed on the system.  Earlier or more recent versions (4.2.x or
-    4.4.x) will NOT work.  To check whether Qt4 is installed, and the version,
-    type:
-    + qmake --version
+** Qt (from http://trolltech.com/products/qt)
+   The ParaView 3.6 visualisation package requires that Qt version 4.3.x MUST
+   be installed on the system.  Earlier or more recent versions (4.2.x or
+   4.4.x) will NOT work.  To check whether Qt4 is installed, and the version,
+   type:
+   + qmake --version
 
-    The ParaView binary executables in the ThirdParty distribution will only
-    work with PRECISELY the same version of Qt with which it was compiled.  The
-    64-bit version of ParaView was compiled with Qt-4.3.1 (with openSuSE-10.3)
-    and the 32-bit version of ParaView was compiled with Qt-4.3.2 (with
-    ubuntu-7.10).  If the user finds that a ParaView binary fails to run, then
-    it is almost certainly due to a conflict in compiled and installed Qt
-    versions and they will need to consult the section below on "Compiling
-    ParaView and the PV3FoamReader module."
+   The ParaView binary executables in the ThirdParty distribution will only
+   work with PRECISELY the same version of Qt with which it was compiled.  The
+   64-bit version of ParaView was compiled with Qt-4.3.1 (with openSuSE-10.3)
+   and the 32-bit version of ParaView was compiled with Qt-4.3.2 (with
+   ubuntu-7.10).  If the user finds that a ParaView binary fails to run, then
+   it is almost certainly due to a conflict in compiled and installed Qt
+   versions and they will need to consult the section below on "Compiling
+   ParaView and the PV3FoamReader module."
 
-    The default versions of Qt used by some GNU/Linux releases are as follows.
-    + ubuntu-7.10:   Version 4.3.2
-    + ubuntu-8.04:   Version 4.3.4
-    + openSuSE-10.2: Version 4.2.1 - too old
-    + openSuSE-10.3: Version 4.3.1
-    + openSuSE-11.0: Version 4.4.0 - too new
+   The default versions of Qt used by some GNU/Linux releases are as follows.
+   + ubuntu-7.10:   Version 4.3.2
+   + ubuntu-8.04:   Version 4.3.4
+   + openSuSE-10.2: Version 4.2.1 - too old
+   + openSuSE-10.3: Version 4.3.1
+   + openSuSE-11.0: Version 4.4.0 - too new
 
-    Compilation and running of ParaView has been successful using the libraries
-    downloaded in the "libqt4-dev" package on ubuntu.
+   Compilation and running of ParaView has been successful using the libraries
+   downloaded in the "libqt4-dev" package on ubuntu.
 
-    If you don't have an appropriate version of Qt installed you can download
-    the sources from TrollTech e.g.:
-    ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.5.tar.bz2
-    and compile and install in /usr/local or some other location that does to
-    conflict with the pre-installed version.
+   If you don't have an appropriate version of Qt installed you can download
+   the sources from TrollTech e.g.:
+   ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-4.3.5.tar.bz2
+   and compile and install in /usr/local or some other location that does to
+   conflict with the pre-installed version.
 
 * Installation
   Download and unpack the files in the $HOME/OpenFOAM directory as described in:
@@ -85,26 +85,26 @@
 
     + source $HOME/.cshrc
 
-*** Installation in alternative locations
-    OpenFOAM may also be installed in alternative locations. However, the
-    installation directory should be network available (e.g., NFS) if parallel
-    calculations are planned.
+** Installation in alternative locations
+   OpenFOAM may also be installed in alternative locations. However, the
+   installation directory should be network available (e.g., NFS) if parallel
+   calculations are planned.
 
-    The environment variable 'FOAM_INST_DIR' can be used to find and source the
-    appropriate resource file. Here is a bash/ksh/sh example:
+   The environment variable 'FOAM_INST_DIR' can be used to find and source the
+   appropriate resource file. Here is a bash/ksh/sh example:
 
-    + export FOAM_INST_DIR=/data/app/OpenFOAM
-    + foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
-    + [ -f $foamDotFile ] && . $foamDotFile
+   + export FOAM_INST_DIR=/data/app/OpenFOAM
+   + foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
+   + [ -f $foamDotFile ] && . $foamDotFile
 
-    and a csh/tcsh example:
+   and a csh/tcsh example:
 
-    + setenv FOAM_INST_DIR /data/app/OpenFOAM
-    + foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
-    + if ( -f $foamDotFile ) source $foamDotFile
+   + setenv FOAM_INST_DIR /data/app/OpenFOAM
+   + foamDotFile=$FOAM_INST_DIR/OpenFOAM-<VERSION>/etc/bashrc
+   + if ( -f $foamDotFile ) source $foamDotFile
 
-    The value set in '$FOAM_INST_DIR' will be used to locate the remaining parts
-    of the OpenFOAM installation.
+   The value set in '$FOAM_INST_DIR' will be used to locate the remaining parts
+   of the OpenFOAM installation.
 
 * Building from Sources (Optional)
   If you cannot find an appropriate binary pack for your platform, you can build
@@ -154,14 +154,15 @@
   + icoFoam
   + paraFoam
 
-* Compiling Paraview 3.3 and the PV3FoamReader module
-  A version of Qt 4.3.x must be installed to compile ParaView.  The compilation
-  is a fairly simple process using the supplied buildParaView script that
-  has worked in our tests with other packages supplied in the ThirdParty
-  directory, namely cmake-2.6.4 and gcc-4.3.3.  Execute the following:
+* Compiling Paraview 3 and the PV3FoamReader module
+  A version of Qt 4.3.x must be installed to compile ParaView. The
+  compilation is a fairly simple process using the makeParaView script
+  (found in ThirdParty directory) that has worked in our tests with other
+  packages supplied in the ThirdParty directory, namely cmake-2.6.4 and
+  gcc-4.3.3. Execute the following:
   + cd $WM_THIRD_PARTY_DIR
   + rm -rf paraview-3.6/platforms
-  + buildParaView
+  + ./makeParaView
 
 
   The PV3FoamReader module is an OpenFOAM utility that can be compiled in the
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index e0a4e315da..2791c1121e 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -6,7 +6,7 @@ cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 # build libccmio and create lnInclude directory
-$WM_PROJECT_DIR/bin/tools/AllwmakeLibccmio
+$WM_THIRD_PARTY_DIR/AllwmakeLibccmio
 
 # if the library built properly, the headers should exist too
 if [ -e $FOAM_LIBBIN/libccmio.so ]
diff --git a/bin/buildParaView b/bin/buildParaView
deleted file mode 100755
index c23644e804..0000000000
--- a/bin/buildParaView
+++ /dev/null
@@ -1,225 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     buildParaView
-#
-# Description
-#     Build and install paraview
-#     - run from folder above paraview source folder or place the
-#       paraview source under $WM_THIRD_PARTY_DIR
-#
-#------------------------------------------------------------------------------
-. $WM_PROJECT_DIR/bin/tools/buildParaViewFunctions
-
-# User options:
-# ~~~~~~~~~~~~~
-
-# MPI support:
-withMPI=false
-MPI_MAX_PROCS=32
-
-# Python support:
-# note: script will try to determine the appropriate python library.
-#       If it fails, specify the path using the PYTHON_LIBRARY variable
-withPYTHON=false
-PYTHON_LIBRARY=""
-# PYTHON_LIBRARY="/usr/lib64/libpython2.6.so.1.0"
-
-# MESA graphics support:
-withMESA=false
-MESA_INCLUDE="/usr/include/GL"
-MESA_LIBRARY="/usr/lib64/libOSMesa.so"
-
-# extra QT gui support (useful for re-using the installation for engrid)
-withQTSUPPORT=true
-
-# Set the path to the Qt-4.3.? qmake if the system Qt is other than this version
-QMAKE_PATH=""
-
-#
-# No further editing below this line
-#------------------------------------------------------------------------------
-Script=${0##*/}
-
-usage() {
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-
-usage: $Script [OPTION]
-options:
-  -rebuild      for repeated builds (-make -install) *use with caution*
-  -mpi          with mpi (if not already enabled)
-  -python       with python (if not already enabled)
-  -mesa         with mesa (if not already enabled)
-  -qt           with extra Qt gui support (if not already enabled)
-  -verbose      verbose output in Makefiles
-  -version VER  specify an alternative version (default: $ParaView_VERSION)
-  -help
-
-For finer control, the build stages can be also selected individually
-(mutually exclusive)
-  -config
-  -make
-  -makedoc
-  -install
-  -envpath      alter absolute paths in CMake files to use env variables
-
-Build and install paraview-$ParaView_VERSION
-  - run from folder above the ParaView source folder or place the ParaView
-    source under \$WM_THIRD_PARTY_DIR ($WM_THIRD_PARTY_DIR)
-
-USAGE
-    exit 1
-}
-
-#------------------------------------------------------------------------------
-
-#
-# add options based on script name:
-#
-case "$Script" in *-mpi*)    withMPI=true;; esac
-case "$Script" in *-python*) withPYTHON=true;; esac
-case "$Script" in *-mesa*)   withMESA=true;; esac
-case "$Script" in *-qt*)     withQTSUPPORT=true;; esac
-
-#
-# various building stages
-#
-runCONFIG=true
-runMAKE=true
-runMAKEDOC=true
-runINSTALL=true
-runENVPATH=true
-
-
-# parse options
-while [ "$#" -gt 0 ]
-do
-    case "$1" in
-    -h | -help)
-        usage
-        ;;
-    -config)             # stage 1: config only
-        runCONFIG=true
-        runMAKE=false
-        runMAKEDOC=false
-        runINSTALL=false
-        shift
-        ;;
-    -make)               # stage 2: make only
-        runCONFIG=false
-        runMAKE=true
-        runMAKEDOC=false
-        runINSTALL=false
-        shift
-        ;;
-    -makedoc)            # stage 3: generate html documentation
-        runCONFIG=false
-        runMAKE=false
-        runMAKEDOC=true
-        runINSTALL=false
-        shift
-        ;;
-    -install)            # stage 4: install only
-        runCONFIG=false
-        runMAKE=false
-        runMAKEDOC=false
-        runINSTALL=true
-        shift
-        ;;
-    -envpath)            # stage 5: change cmake files to use env variables
-        runCONFIG=false
-        runMAKE=false
-        runMAKEDOC=false
-        runINSTALL=false
-        runENVPATH=true
-        shift
-        ;;
-    -rebuild)            # shortcut for rebuilding
-        runCONFIG=false
-        runMAKE=true
-        runMAKEDOC=false
-        runINSTALL=true
-        shift
-        ;;
-    -mpi)
-        withMPI=true
-        shift
-        ;;
-    -python)
-        withPYTHON=true
-        shift
-        ;;
-    -mesa)
-        withMESA=true
-        shift
-        ;;
-    -qt)
-        withQTSUPPORT=true
-        shift
-        ;;
-    -qmake)
-        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        export QMAKE_PATH=$2
-        shift 2
-        ;;
-    -verbose)
-        withVERBOSE=true
-        shift
-        ;;
-    -version)
-        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        export ParaView_VERSION=$2
-        shift 2
-        ;;
-    *)
-        usage "unknown option/argument: '$*'"
-        ;;
-    esac
-done
-
-
-# Set configure options
-#~~~~~~~~~~~~~~~~~~~~~~
-addVerbosity        # verbose makefiles
-addMpiSupport       # set MPI-specific options
-addPythonSupport    # set Python-specific options
-addMesaSupport      # set MESA-specific options
-addQtSupport        # add extra Qt support
-
-getPaths            # discover where things are or should be put
-
-
-# Build and install
-# ~~~~~~~~~~~~~~~~~
-[ $runCONFIG  = true ] && configParaView
-[ $runMAKE    = true ] && makeParaView
-[ $runMAKEDOC = true ] && makeDocs
-[ $runINSTALL = true ] && installParaView
-[ $runENVPATH = true ] && fixCMakeFiles
-
-echo "done"
-#------------------------------------------------------------------------------
diff --git a/bin/buildParaView-python b/bin/buildParaView-python
deleted file mode 120000
index 5c6464acd1..0000000000
--- a/bin/buildParaView-python
+++ /dev/null
@@ -1 +0,0 @@
-buildParaView
\ No newline at end of file
diff --git a/bin/foamTags b/bin/foamTags
index e00795d8e6..9c173497f6 100755
--- a/bin/foamTags
+++ b/bin/foamTags
@@ -31,17 +31,29 @@
 #
 #------------------------------------------------------------------------------
 
-if [ $# -ne 0 ]; then
-   echo "Usage : ${0##*/}"
-   echo ""
-   echo "Build the tags files for all the .C and .H files"
-   echo ""
-   exit 1
+if [ $# -ne 0 ]
+then
+    echo "Usage : ${0##*/}"
+    echo ""
+    echo "Build the tags files for all the .C and .H files"
+    echo ""
+    exit 1
 fi
 
-cd $WM_PROJECT_DIR
+
+for cmd in etags ectags
+do
+    type $cmd >/dev/null 2>&1 || {
+        echo "${0##*/} cannot build tag files: '$cmd' command not found"
+        exit
+    }
+done
+
+
+cd $WM_PROJECT_DIR || exit
 mkdir .tags 2>/dev/null
 
+
 etagsCmd="etags --declarations -l c++ -o .tags/etags -"
 #etagsDefCmd="etags -l c++ -o .tags/etagsDef -"
 #etagsDecCmd="etags --declarations -l c++ -o .tags/etagsDec -"
diff --git a/bin/tools/AllwcleanThirdParty b/bin/tools/AllwcleanThirdParty
deleted file mode 100755
index 6b233f92c6..0000000000
--- a/bin/tools/AllwcleanThirdParty
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     AllwcleanThirdParty
-#
-# Description
-#     Distribution clean script for ThirdParty
-#
-#     Still somewhat incomplete
-#------------------------------------------------------------------------------
-[ -d "$WM_THIRD_PARTY_DIR" ] || {
-    echo "no \$WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
-    exit 1
-}
-
-cd $WM_THIRD_PARTY_DIR || exit 1    # run from third-party directory
-set -x
-
-rm -rf gcc-4.3.3/build
-rm -rf gmp-4.2.4/build
-rm -rf mpfr-2.4.1/build
-
-( cd metis-5.0pre2 && make distclean )
-( cd openmpi-1.3.3 && make distclean )
-( cd paraview-3.6.1 && make distclean )
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/AllwmakeLibccmio b/bin/tools/AllwmakeLibccmio
deleted file mode 100755
index c4b9d63d3c..0000000000
--- a/bin/tools/AllwmakeLibccmio
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2007 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     AllwmakeLibccmio
-#
-# Description
-#     Get and build CD-adapco's ccmio library
-#
-#------------------------------------------------------------------------------
-packageDir=libccmio-2.6.1
-
-[ -d "$WM_THIRD_PARTY_DIR" ] || {
-    echo "no \$WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
-    exit 1
-}
-
-cd $WM_THIRD_PARTY_DIR || exit 1    # run from third-party directory
-set -x
-
-if [ ! -d ${packageDir} ]
-then
-    if [ ! -e ${packageDir}.tar.gz ]
-    then
-        wget --no-check-certificate \
-            https://wci.llnl.gov/codes/visit/3rd_party/${packageDir}.tar.gz
-    fi
-
-     if [ -e ${packageDir}.tar.gz ]
-     then
-         tar -xzf ${packageDir}.tar.gz
-     else
-         echo "no ${packageDir}.tar.gz to unpack"
-     fi
-fi
-
-if [ -d ${packageDir} -a ! -d ${packageDir}/Make ]
-then
-    cp -r wmakeFiles/libccmio ${packageDir}/Make
-fi
-
-if [ -d ${packageDir}/Make ]
-then
-    wmake libso ${packageDir}
-fi
-
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/AllwmakeThirdParty b/bin/tools/AllwmakeThirdParty
deleted file mode 100755
index 83d4746a07..0000000000
--- a/bin/tools/AllwmakeThirdParty
+++ /dev/null
@@ -1,194 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     AllwmakeThirdParty
-#
-# Description
-#     Build script for ThirdParty sources
-#
-#------------------------------------------------------------------------------
-
-[ -d "$WM_THIRD_PARTY_DIR" ] || {
-    echo "no \$WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
-    exit 1
-}
-
-cd $WM_THIRD_PARTY_DIR || exit 1    # run from third-party directory
-set -x
-
-
-# export WM settings in a form that GNU configure recognizes
-[ -n "$WM_CC" ]         &&  export CC="$WM_CC"
-[ -n "$WM_CXX" ]        &&  export CXX="$WM_CXX"
-[ -n "$WM_CFLAGS" ]     &&  export CFLAGS="$WM_CFLAGS"
-[ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
-[ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
-
-wmake libso zlib-1.2.3
-( cd malloc && ./Allwmake )
-
-#
-# compile specific mpi libraries
-#
-case "$WM_MPLIB" in
-OPENMPI)
-    if [ -r $MPI_ARCH_PATH/lib/libmpi.so ]
-    then
-        echo "have $WM_MPLIB shared library"
-    elif [ -r $MPI_ARCH_PATH/lib/libmpi.a ]
-    then
-        echo "have $WM_MPLIB static library"
-    else
-    (
-        cd $MPI_HOME || exit
-
-        make distclean
-        rm -rf $MPI_ARCH_PATH
-
-        unset mpiWith
-        # as of version 1.3, enable GridEngine
-        if [ -n "$SGE_ROOT" ]
-        then
-            mpiWith="$mpiWith --with-sge"
-        fi
-
-        # Infiniband support
-        # if [ -d /usr/local/ofed -a -d /usr/local/ofed/lib64 ]
-        # then
-        #     mpiWith="$mpiWith --with-openib=/usr/local/ofed"
-        #     mpiWith="$mpiWith --with-openib-libdir=/usr/local/ofed/lib64"
-        # fi
-
-        ./configure \
-            --prefix=$MPI_ARCH_PATH \
-            --disable-mpirun-prefix-by-default \
-            --disable-orterun-prefix-by-default \
-            --enable-shared --disable-static \
-            --disable-mpi-f77 --disable-mpi-f90 --disable-mpi-cxx \
-            --disable-mpi-profile \
-            $mpiWith \
-            ;
-
-        make
-        make install
-        make distclean
-    )
-    fi
-    ;;
-
-MPICH)
-    if [ -r $MPI_ARCH_PATH/lib/libmpich.so ]
-    then
-        echo "have $WM_MPLIB shared library"
-    elif [ -r $MPI_ARCH_PATH/lib/libmpich.a ]
-    then
-        echo "have $WM_MPLIB static library"
-    else
-    (
-        cd $MPI_HOME || exit
-
-        make distclean
-        rm -rf $MPI_ARCH_PATH
-        rm util/machines/machines.*
-
-        ./configure \
-            --without-mpe \
-            --disable-f77 \
-            --disable-f90 \
-            --disable-f90modules \
-            --disable-c++ \
-            --disable-mpedbg \
-            --disable-devdebug \
-            --disable-debug \
-            --enable-sharedlib=$MPI_ARCH_PATH/lib \
-            --with-device=ch_p4 \
-            -prefix=$MPI_ARCH_PATH
-        make
-        make install
-        make distclean
-
-        if [ -r $MPI_ARCH_PATH ]
-        then
-            cd $MPI_ARCH_PATH/bin
-            for file in *
-            do
-                sed s%$MPI_ARCH_PATH%'$MPI_ARCH_PATH'%g $file > temp.$$
-                mv temp.$$ $file
-                chmod 0755 $file
-            done
-
-            cd $MPI_ARCH_PATH/lib
-
-            if [ -r libmpich.so.1.0 ]
-            then
-                rm *.so
-                ln -s libmpich.so.1.0 libmpich.so
-            fi
-        fi
-    )
-    fi
-    ;;
-
-esac
-
-# Build Scotch decomposition
-(
-    cd scotch_5.1 || exit
-    wmake libso src/libscotch
-    wmake libso src/libscotchmetis
-)
-
-# Build Metis decomposition
-(
-    cd metis-5.0pre2 || exit
-    wmake libso GKlib
-    wmake libso libmetis
-)
-
-# Build parMetis. Requires MPI!
-if [ -d "$MPI_ARCH_PATH" ]
-then
-(
-    cd ParMetis-3.1 || exit
-    wmake libso METISLib
-    wmake libso ParMETISLib
-)
-fi
-
-
-# Build ParMGridGen
-wmake libso ParMGridGen-1.0/MGridGen/IMlib
-wmake libso ParMGridGen-1.0/MGridGen/Lib
-
-
-set +x
-echo
-echo ==============================
-echo done ThirdParty Allwmake
-echo ==============================
-echo
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions
deleted file mode 100644
index ff37e259b5..0000000000
--- a/bin/tools/buildParaViewFunctions
+++ /dev/null
@@ -1,445 +0,0 @@
-#---------------------------------*- sh -*-------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     buildParaViewFunctions
-#
-# Description
-#     ParaView build/install helper functions
-#
-#------------------------------------------------------------------------------
-
-# ParaView_INST_DIR  : location of the original sources
-# ParaView_DIR       : location of the build (for the ParaViewConfig.cmake)
-#                      and the installed program
-
-
-#
-# set CMake cache variables
-#
-addCMakeVariable()
-{
-    while [ -n "$1" ]
-    do
-        CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1"
-        shift
-    done
-}
-
-
-#
-# verbose makefiles
-#
-addVerbosity()
-{
-    [ "$withVERBOSE" = true ] && addCMakeVariable  CMAKE_VERBOSE_MAKEFILE=TRUE
-}
-
-
-#
-# define options for mpi support
-#
-addMpiSupport()
-{
-    [ "${withMPI:=false}" = true ] || return
-    OBJ_ADD="$OBJ_ADD-mpi"
-
-    addCMakeVariable  PARAVIEW_USE_MPI=ON VTK_USE_MPI=ON
-    addCMakeVariable  MPI_INCLUDE_PATH=$MPI_ARCH_PATH/include
-    addCMakeVariable  MPI_LIBRARY=$MPI_ARCH_PATH/lib/libmpi.so
-    addCMakeVariable  VTK_MPIRUN_EXE=$MPI_ARCH_PATH/bin/mpirun
-    addCMakeVariable  VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS
-}
-
-
-#
-# define options for python support
-#
-addPythonSupport()
-{
-    [ "${withPYTHON:=false}" = true ] || return
-    OBJ_ADD="$OBJ_ADD-py"
-
-    if pythonBin=$(which python 2>/dev/null)
-    then
-        if [ -n "$PYTHON_LIBRARY" ]
-        then
-            # check $PYTHON_LIBRARY if it has been set
-            if [ ! -e "$PYTHON_LIBRARY" ]
-            then
-                echo "*** Error: libpython not found at location specified " \
-                     "by PYTHON_LIBRARY=$PYTHON_LIBRARY"
-            fi
-        else
-            # Try to get $PYTHON_LIBRARY from dynamically linked binary
-            PYTHON_LIBRARY=$(ldd $pythonBin | \
-                sed -ne '/libpython/s/.* => \(.*\) (.*/\1/p')
-
-           if [ ! -e "$PYTHON_LIBRARY" ]
-           then
-               echo "*** Error: Unable to determine path to python library."
-           fi
-        fi
-
-        [ -e "$PYTHON_LIBRARY" ] || {
-            echo "    Please set the variable PYTHON_LIBRARY to the full"
-            echo "    path to (and including) libpython, or deactivate"
-            echo "    python support by setting withPYTHON=false"
-            exit 1
-        }
-
-        pythonMajor=$(echo $PYTHON_LIBRARY | sed 's/.*libpython\(.*\)\.so.*/\1/')
-        pythonInclude=/usr/include/python$pythonMajor
-
-        # note - we could also allow for a PYTHON_INCLUDE variable ...
-        [ -d "$pythonInclude" ] || {
-            echo "    No python headers found in $pythonInclude/"
-            echo "    Please install python headers or deactivate "
-            echo "    python support by setting withPYTHON=false"
-            exit 1
-        }
-
-        addCMakeVariable  PARAVIEW_ENABLE_PYTHON=ON
-        addCMakeVariable  PYTHON_INCLUDE_PATH=$pythonInclude
-        addCMakeVariable  PYTHON_LIBRARY=$PYTHON_LIBRARY
-
-        echo "----"
-        echo "Python information:"
-        echo "    executable     : $pythonBin"
-        echo "    version        : $pythonMajor"
-        echo "    include path   : $pythonInclude"
-        echo "    library        : $PYTHON_LIBRARY"
-
-        unset pythonBin pythonInclude pythonMajor
-    else
-        echo "*** Error: python not found"
-        echo "***        Deactivate python support by setting withPYTHON=false"
-        exit 1
-    fi
-}
-
-
-#
-# define options for mesa support
-#
-addMesaSupport()
-{
-    [ "${withMESA:=false}" = true ] || return
-
-    if [ -d "$MESA_INCLUDE" -a -f "$MESA_LIBRARY" ]
-    then
-        OBJ_ADD="$OBJ_ADD-mesa"
-
-        addCMakeVariable  VTK_OPENGL_HAS_OSMESA=ON
-        addCMakeVariable  OSMESA_INCLUDE_DIR=$MESA_INCLUDE
-        addCMakeVariable  OSMESA_LIBRARY=$MESA_LIBRARY
-
-    else
-       echo "*** Error: no MESA information found"
-       echo "***        Deactivate MESA support by setting withMESA=false, or"
-       echo "***        correct the paths given by:"
-       echo "***        - MESA_INCLUDE ($MESA_INCLUDE)"
-       echo "***        - MESA_LIBRARY ($MESA_LIBRARY)"
-       exit 1
-    fi
-}
-
-addQtSupport()
-{
-    [ "${withQTSUPPORT:=false}" = true ] || return
-
-    addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON"
-
-    qmakeExe=qmake
-
-    if [ -n "$QMAKE_PATH" ]
-    then
-        if [ -x "$QMAKE_PATH" ]
-        then
-            qmakeExe=$QMAKE_PATH
-            addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH
-        else
-            echo
-            echo "specified QMAKE_PATH does not exist on this machine"
-            echo "    QMAKE_PATH=$QMAKE_PATH"
-            echo "leaving unspecified"
-            echo
-        fi
-    fi
-
-    # Check qmake can be found
-    if [ `which $qmakeExe` ]
-    then
-        # Check the Qt version selected
-        QtVersion=`$qmakeExe -v | grep Using | sed "s/.* version \(.\..\).*/\1/"`
-        QtMajor=`echo $QtVersion | sed "s/\(.\)\../\1/"`
-        QtMinor=`echo $QtVersion | sed "s/.\.\(.\)/\1/"`
-
-        if [ $QtMajor -lt 4 -o $QtMinor -lt 3 ]
-        then
-            echo "*** Error: Qt version provided < 4.3"
-            echo "***     Please use the -qmake option to specify the location of a version of Qt >= 4.3 "
-            echo "***     e.g."
-            echo "***         -qmake /usr/local/Trolltech/Qt-4.3.5/bin/qmake"
-            echo "***         -qmake $WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/$WM_OPTIONS/bin/qmake"
-            exit 1
-        fi
-    else
-        echo "*** Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH"
-        exit 1
-    fi
-}
-
-
-#
-# discover where things are or should be put
-#
-getPaths()
-{
-    # set paraview environment
-    for i in $PWD $WM_THIRD_PARTY_DIR
-    do
-        ParaView_INST_DIR=$i/paraview-$ParaView_VERSION
-        [ -d $ParaView_INST_DIR ] && break
-    done
-
-    if [ ! -d "$ParaView_INST_DIR" ]
-    then
-        # last chance: maybe already in the paraview directory
-        if [ "${PWD##*/}" = "paraview-$ParaView_VERSION" ]
-        then
-            ParaView_INST_DIR=$PWD
-        fi
-
-        [ -d "$ParaView_INST_DIR" ] || {
-            echo "did not find paraview-$ParaView_VERSION in these directories:"
-            echo "  PWD=$PWD"
-            echo "  WM_THIRD_PARTY_DIR=$WM_THIRD_PARTY_DIR"
-            echo
-            echo "abort build"
-            exit 1
-        }
-    fi
-
-    # set the major version "<digits>.<digits>"
-    ParaView_MAJOR_VERSION=$(echo $ParaView_VERSION | \
-        sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
-
-    # ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER$OBJ_ADD
-    ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER
-    echo "ParaView_DIR=$ParaView_DIR"
-}
-
-
-#
-# configure via cmake, but don't actually build anything
-#
-configParaView()
-{
-    # remove any existing build folder and recreate
-    if [ -d $ParaView_DIR ]
-    then
-        echo "removing old build/install directory"
-        rm -rf $ParaView_DIR
-    fi
-    mkdir -p $ParaView_DIR
-
-    cd $ParaView_DIR
-
-    echo "----"
-    echo "Configuring paraview-$ParaView_VERSION (major version: $ParaView_MAJOR_VERSION)"
-    echo "    MPI    support : ${withMPI:-false}"
-    echo "    Python support : ${withPYTHON:-false}"
-    echo "    MESA   support : ${withMESA:-false}"
-    echo "    Qt dev support : ${withQTSUPPORT:-false}"
-    echo "    Source         : $ParaView_INST_DIR"
-    echo "    Target         : $ParaView_DIR"
-    echo "----"
-    echo
-    echo cmake \
-        -DCMAKE_INSTALL_PREFIX:PATH=$ParaView_DIR \
-        $CMAKE_VARIABLES \
-        ../..
-    echo
-    echo "----"
-    echo
-
-    # run cmake to create Makefiles
-    cmake \
-        -DCMAKE_INSTALL_PREFIX:PATH=$ParaView_DIR \
-        $CMAKE_VARIABLES \
-        ../..
-
-}
-
-
-#
-# invoke make
-# also link bin/ to lib/paraview-* for development without installation
-#
-makeParaView()
-{
-    cd $ParaView_DIR || exit 1  # change to build folder
-    echo "    Starting make"
-
-    if [ -r /proc/cpuinfo ]
-    then
-        WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
-        [ $WM_NCOMPPROCS -le 8 ] || WM_NCOMPPROCS=8
-
-        time make -j $WM_NCOMPPROCS
-    else
-        time make
-    fi
-    echo "    Done make"
-
-    echo "    For quicker development, linking lib/paraview-$ParaView_MAJOR_VERSION/ -> bin/"
-    rm -rf lib/paraview-$ParaView_MAJOR_VERSION
-    mkdir lib 2>/dev/null
-    ( cd lib && ln -s ../bin paraview-$ParaView_MAJOR_VERSION )
-}
-
-
-#
-# adjust hard-links (internal function)
-# Note: use loop with grep to avoid touching too many files
-#
-fixHardLinks()
-{
-    envName=$1
-    string=$2
-    shift 2
-
-    echo "-- Replacing path hard links for \$$envName"
-
-    for fileSpec
-    do
-        echo -n "   $fileSpec: "
-        for i in $(find . -type f -iname "$fileSpec")
-        do
-            if grep -q "$string" $i
-            then
-                echo -n "#"
-                sed -i "s,$string,\$ENV{$envName},g" $i
-            fi
-        done
-        echo
-    done
-}
-
-
-#
-# replace absolute paths with environment variables
-# This triggers a partial (or even a full) rebuild, but might let us
-# find our files later if we relocate the build
-#
-fixCMakeFiles()
-{
-    cd $ParaView_DIR || exit 1  # change to build folder
-
-    # Replace path with env variable: ParaView_DIR
-    fixHardLinks ParaView_DIR "$ParaView_DIR" '*.cmake'
-
-    # Replace path with env variable: ParaView_INST_DIR
-    fixHardLinks ParaView_INST_DIR "$ParaView_INST_DIR" '*.cmake'
-
-    # Replace path with env variable: MPI_ARCH_PATH
-    if [ "${withMPI:=false}" = true ]
-    then
-        fixHardLinks MPI_ARCH_PATH "$MPI_ARCH_PATH" '*.cmake'
-    fi
-
-    # Replace path with env variable: CMAKE_HOME
-    if [ -r "$CMAKE_HOME" ]
-    then
-        fixHardLinks CMAKE_HOME "$CMAKE_HOME" '*cmake*'
-    fi
-
-    # Replace path with env variable: WM_COMPILER_DIR
-    # (include cmake.check_cache)
-    # This triggers a complete rebuild (with cmake-2.6.2), but is likely
-    # needed when redistributing files
-    fixHardLinks WM_COMPILER_DIR "$WM_COMPILER_DIR" '*cmake*'
-}
-
-
-#
-# make html documentation (mostly just for the readers/writers)
-#
-makeDocs()
-{
-    cd $ParaView_DIR || exit 1  # change to build folder
-    echo "    Creating html documentation"
-
-    make HTMLDocumentation
-}
-
-
-#
-# actually install the program
-#
-installParaView()
-{
-    cd $ParaView_DIR || exit 1  # change to build folder
-    echo "    Installing ParaView to $ParaView_DIR"
-
-    echo "disabled 'make install' for now, just use links"
-
-    # about.txt may be missing
-    paraviewLibDir="$ParaView_DIR/lib/paraview-$ParaView_MAJOR_VERSION"
-    if [ -d "$paraviewLibDir" -a ! -e "$paraviewLibDir/about.txt" ]
-    then
-        echo "paraview-$ParaView_MAJOR_VERSION installed - $(date)" > $paraviewLibDir/about.txt
-    fi
-
-cat<< INFO
-    ---
-    Installation complete
-    Set environment variables:
-
-        export ParaView_INST_DIR=$ParaView_INST_DIR
-        export ParaView_DIR=$ParaView_DIR
-        export PV_PLUGIN_PATH=$FOAM_LIBBIN
-        export PATH=\$ParaView_DIR/bin:\$PATH
-    ---
-INFO
-}
-
-
-# clear all the variables used before using any of the functions
-unset withMPI withQTSUPPORT withVERBOSE
-unset withMESA   MESA_INCLUDE   MESA_LIBRARY
-unset withPYTHON PYTHON_INCLUDE PYTHON_LIBRARY
-unset CMAKE_VARIABLES
-unset OBJ_ADD
-
-# start with these general settings
-addCMakeVariable  VTK_USE_TK=FALSE
-addCMakeVariable  BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF
-addCMakeVariable  CMAKE_BUILD_TYPE:STRING=Release
-
-# include development files in "make install"
-addCMakeVariable  PARAVIEW_INSTALL_DEVELOPMENT:BOOL=ON
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/makeGcc b/bin/tools/makeGcc
deleted file mode 100755
index 01d6179f2d..0000000000
--- a/bin/tools/makeGcc
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     makeGcc
-#
-# Description
-#     Build script for gmp, mpfr and gcc-4.3.? and gcc-4.4.?
-#
-#------------------------------------------------------------------------------
-
-gmpVERSION=gmp-4.2.4
-mpfrVERSION=mpfr-2.4.1
-gccVERSION="$1"
-
-usage() {
-    while [ "$#" -ge 1 ]; do echo "$1"; shift; done
-    cat<<USAGE
-
-usage: ${0##*/} <gcc-4.?.?> ...
-
-* build gmp, mpfr and gcc-4.3.? and gcc-4.4.?
-
-USAGE
-    exit 1
-}
-
-[ "$#" -eq 1 ] || usage "gcc version not provided"
-
-
-#
-# Set the number of cores to build on
-#
-WM_NCOMPPROCS=1
-
-if [ -r /proc/cpuinfo ]
-then
-    WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
-    [ $WM_NCOMPPROCS -le 8 ] || WM_NCOMPPROCS=8
-fi
-
-echo "Building on " $WM_NCOMPPROCS " cores"
-
-GCC_DIR=$WM_THIRD_PARTY_DIR/$gccVERSION
-GMP_DIR=$WM_THIRD_PARTY_DIR/$gmpVERSION
-MPFR_DIR=$WM_THIRD_PARTY_DIR/$mpfrVERSION
-
-GCCROOT=${GCC_DIR}/platforms/$WM_ARCH$WM_COMPILER_ARCH
-GMPROOT=${GMP_DIR}/platforms/$WM_ARCH$WM_COMPILER_ARCH
-MPFRROOT=${MPFR_DIR}/platforms/$WM_ARCH$WM_COMPILER_ARCH
-
-#
-# Bulid GMP
-#
-if [ ! -d $GMPROOT ]
-then
-(
-       cd $GMP_DIR \
-    && make distclean \
-    && mkdir $GMP_DIR/build \
-    && cd $GMP_DIR/build \
-    && ../configure ABI=$ABI --prefix=$GMPROOT \
-    && make -j $WM_NCOMPPROCS \
-    && make install
-
-    echo "    Finished building gmp."
-)
-else
-    echo "    gmp already built."
-fi
-
-export LD_LIBRARY_PATH="$GMPROOT/lib:$LD_LIBRARY_PATH"
-
-#
-# Build MPFR
-#
-if [ ! -d $MPFRROOT ]
-then
-(
-       cd $MPFR_DIR \
-    && make distclean \
-    && mkdir $MPFR_DIR/build \
-    && cd $MPFR_DIR/build \
-    && ../configure ABI=$ABI --prefix=$MPFRROOT --with-gmp=$GMPROOT \
-    && make -j $WM_NCOMPPROCS  \
-    && make install
-
-    echo "    Finished building mpfr."
-)
-else
-    echo "    mprf already built."
-fi
-
-export LD_LIBRARY_PATH="$MPFRROOT/lib:$LD_LIBRARY_PATH"
-
-#
-# Build GCC
-#
-if [ ! -d $GCCROOT ]
-then
-(
-       cd $GCC_DIR \
-    && make distclean \
-    && mkdir $GCC_DIR/build \
-    && cd $GCC_DIR/build \
-    && ../configure --enable-languages=c,c++ --with-pkgversion='OpenFOAM' \
-           --enable-__cxa_atexit --enable-libstdcxx-allocator=new \
-           --with-system-zlib --prefix=$GCCROOT \
-           --with-mpfr=$MPFRROOT --with-gmp=$GMPROOT \
-    && make -j $WM_NCOMPPROCS \
-    && make install
-
-    echo "    Finished building gcc."
-)
-else
-    echo "    gcc already built."
-fi
-
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/makeQT b/bin/tools/makeQT
deleted file mode 100755
index 8a4e047072..0000000000
--- a/bin/tools/makeQT
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#------------------------------------------------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     makeQT
-#
-# Description
-#     Build script for Qt-4.3.5
-#
-#------------------------------------------------------------------------------
-
-QT_VERSION=4.3.5
-QT_HOME=${WM_THIRD_PARTY_DIR}/qt-x11-opensource-src-${QT_VERSION}
-QT_ARCH_PATH=${QT_HOME}/platforms/${WM_OPTIONS}
-
-
-if [ ! -d $QT_ARCH_PATH ]
-then
-    cd $QT_HOME || {
-       echo "no Qt sources found"
-       exit 1
-    }
-
-    make distclean
-    rm -rf $QT_ARCH_PATH
-
-    ./configure \
-        --prefix=$QT_ARCH_PATH \
-        -nomake demos \
-        -nomake examples
-
-    if [ -r /proc/cpuinfo ]
-    then
-        WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
-        [ $WM_NCOMPPROCS -le 8 ] || WM_NCOMPPROCS=8
-
-        echo "Building on " $WM_NCOMPPROCS " cores"
-
-        time make -j $WM_NCOMPPROCS
-    else
-        time make
-    fi
-
-    make install
-
-    echo "    Finished building Qt-$QT_VERSION"
-else
-    echo "    Qt-$QT_VERSION already built."
-fi
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/tools/thirdPartyGetFunctions b/bin/tools/thirdPartyGetFunctions
deleted file mode 100644
index b1e94ae8b3..0000000000
--- a/bin/tools/thirdPartyGetFunctions
+++ /dev/null
@@ -1,78 +0,0 @@
-#---------------------------------*- sh -*-------------------------------------
-# =========                 |
-# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-#  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
-#    \\/     M anipulation  |
-#------------------------------------------------------------------------------
-# License
-#     This file is part of OpenFOAM.
-#
-#     OpenFOAM is free software; you can redistribute it and/or modify it
-#     under the terms of the GNU General Public License as published by the
-#     Free Software Foundation; either version 2 of the License, or (at your
-#     option) any later version.
-#
-#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-#     for more details.
-#
-#     You should have received a copy of the GNU General Public License
-#     along with OpenFOAM; if not, write to the Free Software Foundation,
-#     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#
-# Script
-#     thirdPartyGetFunctions
-#
-# Description
-#     Functions for managing the third-party packages
-#
-#------------------------------------------------------------------------------
-
-#
-# get, unpack and change to third party directory
-# - call from within a sub-shell, since it uses 'cd'
-#
-getUnpack() {
-   [ "$#" -eq 1 ] || {
-      echo "getUnpack called with incorrect arguments $@"
-      return 1
-   }
-
-   d=$(foamThirdParty -dir $1 2>/dev/null) || {
-      echo "nothing know about '$1'"
-      return 1
-   }
-
-   foamThirdParty -get -unpack $1 && [ -d "$d" ] || return 1
-
-   [ -d "$d" ] && chmod -R ugo+rX $d 2>/dev/null
-
-   echo $d
-}
-
-#
-# copy Make/{files,options} from wmakeFiles/PACKAGE
-#
-cpMakeFiles() {
-   [ "$#" -eq 2 ] || {
-      echo "cpMakeFiles called with incorrect arguments $@"
-      return 1
-   }
-
-   pkg=$1
-   dst=$2
-
-   for i in $(cd wmakeFiles/$pkg && find . -type f)
-   do
-      d=$(dirname  $i)
-      b=$(basename $i)
-
-      mkdir -p $dst/$d/Make 2>/dev/null
-      [ -e $dst/$d/Make/$b ] || cp wmakeFiles/$pkg/$i $dst/$d/Make/$b
-   done
-}
-
-
-# ----------------------------------------------------------------- end-of-file
diff --git a/bin/touchapp b/bin/touchapp
index abe4d6f5c1..a753357566 100755
--- a/bin/touchapp
+++ b/bin/touchapp
@@ -32,17 +32,17 @@
 
 if [ "$#" -ne 0 ]
 then
-   echo "Usage: ${0##*/}"
-   echo "    touch FOAM_APPBIN"
-   exit 1
+    echo "Usage: ${0##*/}"
+    echo "    touch FOAM_APPBIN"
+    exit 1
 fi
 
 
 if [ -d "$FOAM_APPBIN" ]
 then
-   echo "touching FOAM_APPBIN: $FOAM_APPBIN"
-   touch $FOAM_APPBIN/*
+    echo "touching FOAM_APPBIN: $FOAM_APPBIN"
+    touch $FOAM_APPBIN/*
 else
-   echo "no FOAM_APPBIN: $FOAM_APPBIN"
+    echo "no FOAM_APPBIN: $FOAM_APPBIN"
 fi
 #------------------------------------------------------------------------------
diff --git a/doc/THIRD_PARTY b/doc/THIRD_PARTY
deleted file mode 100644
index 17f654c450..0000000000
--- a/doc/THIRD_PARTY
+++ /dev/null
@@ -1,35 +0,0 @@
-# A brief listing of some third party sources
-
-# --------------------------------------------------------------------------
-# compiler
-gcc         http://gcc.gnu.org/gcc-4.3/
-mpfr        http://www.mpfr.org/
-gmp         http://gmplib.org/
-
-# --------------------------------------------------------------------------
-# Parallel processing
-
-openmpi     http://www.open-mpi.org/software/ompi/v1.3/downloads/openmpi-1.3.3.tar.bz2
-metis       http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.0pre2.tar.gz
-ParMetis    http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/ParMetis-3.1.tar.gz
-ParMGridGen http://www-users.cs.umn.edu/~moulitsa/download/ParMGridGen-1.0.tar.gz
-mpich       ftp://ftp.mcs.anl.gov/pub/mpi/old/mpich-1.2.4.tar.gz
-scotch      http://gforge.inria.fr/frs/download.php/22247/scotch_5.1.6.tar.gz
-
-# --------------------------------------------------------------------------
-# Allocation
-
-hoard       http://www.cs.umass.edu/%7Eemery/hoard/hoard-3.7.1/hoard-371.tar.gz
-
--> Note: the code needs minor patching
-fbsdmalloc  http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/src/lib/libc/stdlib/malloc.c?rev=1.171
-
-# --------------------------------------------------------------------------
-# Misc
-
-cmake       http://www.cmake.org/files/v2.6/cmake-2.6.4.tar.gz#
-paraview    http://www.paraview.org/files/v3.6/paraview-3.6.1.tar.gz
-libccmio    https://wci.llnl.gov/codes/visit/3rd_party/libccmio-2.6.1.tar.gz
-zlib        http://www.zlib.net/zlib-1.2.3.tar.gz
-
-# --------------------------------------------------------------------------

From f8d87e2ab411129e461945afccefba95c46dd46a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Sat, 25 Jul 2009 20:32:29 +0200
Subject: [PATCH 07/15] first implementation of filename clean method

- test as independent application first
---
 applications/test/fileNameClean/Make/files    |   3 +
 applications/test/fileNameClean/Make/options  |   0
 .../test/fileNameClean/fileNameCleanTest.C    | 216 ++++++++++++++++++
 .../test/foamVersion/foamVersionString.C      |   7 +-
 4 files changed, 223 insertions(+), 3 deletions(-)
 create mode 100644 applications/test/fileNameClean/Make/files
 create mode 100644 applications/test/fileNameClean/Make/options
 create mode 100644 applications/test/fileNameClean/fileNameCleanTest.C

diff --git a/applications/test/fileNameClean/Make/files b/applications/test/fileNameClean/Make/files
new file mode 100644
index 0000000000..8363e079a2
--- /dev/null
+++ b/applications/test/fileNameClean/Make/files
@@ -0,0 +1,3 @@
+fileNameCleanTest.C
+
+EXE = $(FOAM_USER_APPBIN)/fileNameCleanTest
diff --git a/applications/test/fileNameClean/Make/options b/applications/test/fileNameClean/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/fileNameClean/fileNameCleanTest.C b/applications/test/fileNameClean/fileNameCleanTest.C
new file mode 100644
index 0000000000..4a6824d5a4
--- /dev/null
+++ b/applications/test/fileNameClean/fileNameCleanTest.C
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM; if not, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Application
+    fileNameCleanTest
+
+Description
+
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "fileName.H"
+#include "SubList.H"
+#include "IOobject.H"
+#include "IOstreams.H"
+#include "OSspecific.H"
+
+
+using namespace Foam;
+
+//
+// * remove repeated slashes
+//       /abc////def        -->   /abc/def
+//
+// * remove '/./'
+//       /abc/def/./ghi/.   -->   /abc/def/./ghi
+//       abc/def/./         -->   abc/def
+//
+// * remove '/../'
+//       /abc/def/../ghi/jkl/nmo/..   -->   /abc/ghi/jkl
+//       abc/../def/ghi/../jkl        -->   abc/../def/jkl
+//
+// * remove trailing '/'
+//
+bool fileNameCleanThis(fileName& This)
+{
+    // the top slash - we are never allowed to descend below this one
+    register string::size_type top = This.find('/');
+
+    // no slashes - nothing to do
+    if (top == string::npos)
+    {
+        return false;
+    }
+
+    // start with the '/' found:
+    register char prev = '/';
+    register string::size_type nChar = top+1;
+    register string::size_type maxLen = This.size();
+
+    for
+    (
+        register string::size_type src = nChar;
+        src < maxLen;
+        /*nil*/
+    )
+    {
+        register char c = This[src++];
+
+        if (prev == '/')
+        {
+            // repeated '/' - skip it
+            if (c == '/')
+            {
+                continue;
+            }
+
+            // could be '/./' or '/../'
+            if (c == '.')
+            {
+                // found trailing '/.' - skip it
+                if (src >= maxLen)
+                {
+                    continue;
+                }
+
+
+                // peek at the next character
+                register char c1 = This[src];
+
+                // found '/./' - skip it
+                if (c1 == '/')
+                {
+                    src++;
+                    continue;
+                }
+
+                // it is '/..' or '/../'
+                if (c1 == '.' && (src+1 >= maxLen || This[src+1] == '/'))
+                {
+                    // find a candidate for the parent directory
+                    // minimum of 3 characters:  '/x/../'
+                    string::size_type parent =
+                    (
+                        nChar > 2
+                      ? This.rfind('/', nChar-2)
+                      : string::npos
+                    );
+
+
+                    // strip parent directory, provided that it isn't below
+                    // the current top edit point
+                    if (parent != string::npos && parent >= top)
+                    {
+                        nChar = parent + 1;
+                        src += 2;
+                        continue;
+                    }
+
+                    // bad resolution, eg 'abc/../../'
+                    // retain it, but move the top to avoid it being
+                    // considered a valid parent later
+                    top += 3;
+                }
+            }
+        }
+        This[nChar++] = prev = c;
+    }
+
+    // remove trailing slash
+    if (nChar > 1 && This[nChar-1] == '/')
+    {
+        nChar--;
+    }
+
+    This.resize(nChar);
+
+    return (nChar != maxLen);
+}
+
+
+fileName fileNameClean(fileName& This)
+{
+    fileName fName(This);
+    fileNameCleanThis(fName);
+
+    return fName;
+}
+
+
+void printCleaning(fileName& pathName)
+{
+    Info<< "fileName = " << pathName << nl
+        << "  path() = " << pathName.path() << nl
+        << "  name() = " << pathName.name() << nl << nl;
+
+    fileNameCleanThis(pathName);
+
+    Info<< "cleaned  = " << pathName << nl
+        << "  path() = " << pathName.path() << nl
+        << "  name() = " << pathName.name() << nl << nl;
+
+    IOobject::writeDivider(Info);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+    argList::validArgs.insert("fileName .. fileNameN");
+
+    argList args(argc, argv, false, true);
+
+    if (args.additionalArgs().empty())
+    {
+        args.printUsage();
+    }
+
+    if (args.optionFound("case"))
+    {
+        fileName pathName = args.option("case");
+        Info<< "-case\n";
+
+        printCleaning(pathName);
+    }
+
+    forAll(args.additionalArgs(), argI)
+    {
+        fileName pathName = args.additionalArgs()[argI];
+        printCleaning(pathName);
+    }
+
+
+    Info<< "\nEnd" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/foamVersion/foamVersionString.C b/applications/test/foamVersion/foamVersionString.C
index be63290a30..17ac2679e1 100644
--- a/applications/test/foamVersion/foamVersionString.C
+++ b/applications/test/foamVersion/foamVersionString.C
@@ -27,6 +27,7 @@ Application
 
 Description
     Print the OpenFOAM version strings.
+
     Simultaneously the smallest possible program to use a minimal bit of
     the OpenFOAM library
 
@@ -37,9 +38,9 @@ Description
 
 int main()
 {
-    std::cerr
-        << "build   " << Foam::FOAMbuild << "\n"
-        << "version " << Foam::FOAMversion << "\n";
+    std::cout
+        << "version " << Foam::FOAMversion << "\n"
+        << "build   " << Foam::FOAMbuild << "\n";
 
     return 0;
 }

From 35986a3972f3c2cd6e704d85b8652a8038846dda Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Sat, 25 Jul 2009 20:40:52 +0200
Subject: [PATCH 08/15] implement fileName::clean() method

* remove repeated slashes
      /abc////def        -->   /abc/def

* remove '/./'
      /abc/def/./ghi/.   -->   /abc/def/./ghi
      abc/def/./         -->   abc/def

* remove '/../'
      /abc/def/../ghi/jkl/nmo/..   -->   /abc/ghi/jkl
      abc/../def/ghi/../jkl        -->   abc/../def/jkl

* remove trailing '/'
---
 .../test/fileNameClean/fileNameCleanTest.C    | 138 ++----------------
 .../primitives/strings/fileName/fileName.C    | 107 +++++++++++++-
 2 files changed, 115 insertions(+), 130 deletions(-)

diff --git a/applications/test/fileNameClean/fileNameCleanTest.C b/applications/test/fileNameClean/fileNameCleanTest.C
index 4a6824d5a4..b41cc434ca 100644
--- a/applications/test/fileNameClean/fileNameCleanTest.C
+++ b/applications/test/fileNameClean/fileNameCleanTest.C
@@ -40,137 +40,19 @@ Description
 
 using namespace Foam;
 
-//
-// * remove repeated slashes
-//       /abc////def        -->   /abc/def
-//
-// * remove '/./'
-//       /abc/def/./ghi/.   -->   /abc/def/./ghi
-//       abc/def/./         -->   abc/def
-//
-// * remove '/../'
-//       /abc/def/../ghi/jkl/nmo/..   -->   /abc/ghi/jkl
-//       abc/../def/ghi/../jkl        -->   abc/../def/jkl
-//
-// * remove trailing '/'
-//
-bool fileNameCleanThis(fileName& This)
-{
-    // the top slash - we are never allowed to descend below this one
-    register string::size_type top = This.find('/');
-
-    // no slashes - nothing to do
-    if (top == string::npos)
-    {
-        return false;
-    }
-
-    // start with the '/' found:
-    register char prev = '/';
-    register string::size_type nChar = top+1;
-    register string::size_type maxLen = This.size();
-
-    for
-    (
-        register string::size_type src = nChar;
-        src < maxLen;
-        /*nil*/
-    )
-    {
-        register char c = This[src++];
-
-        if (prev == '/')
-        {
-            // repeated '/' - skip it
-            if (c == '/')
-            {
-                continue;
-            }
-
-            // could be '/./' or '/../'
-            if (c == '.')
-            {
-                // found trailing '/.' - skip it
-                if (src >= maxLen)
-                {
-                    continue;
-                }
-
-
-                // peek at the next character
-                register char c1 = This[src];
-
-                // found '/./' - skip it
-                if (c1 == '/')
-                {
-                    src++;
-                    continue;
-                }
-
-                // it is '/..' or '/../'
-                if (c1 == '.' && (src+1 >= maxLen || This[src+1] == '/'))
-                {
-                    // find a candidate for the parent directory
-                    // minimum of 3 characters:  '/x/../'
-                    string::size_type parent =
-                    (
-                        nChar > 2
-                      ? This.rfind('/', nChar-2)
-                      : string::npos
-                    );
-
-
-                    // strip parent directory, provided that it isn't below
-                    // the current top edit point
-                    if (parent != string::npos && parent >= top)
-                    {
-                        nChar = parent + 1;
-                        src += 2;
-                        continue;
-                    }
-
-                    // bad resolution, eg 'abc/../../'
-                    // retain it, but move the top to avoid it being
-                    // considered a valid parent later
-                    top += 3;
-                }
-            }
-        }
-        This[nChar++] = prev = c;
-    }
-
-    // remove trailing slash
-    if (nChar > 1 && This[nChar-1] == '/')
-    {
-        nChar--;
-    }
-
-    This.resize(nChar);
-
-    return (nChar != maxLen);
-}
-
-
-fileName fileNameClean(fileName& This)
-{
-    fileName fName(This);
-    fileNameCleanThis(fName);
-
-    return fName;
-}
-
-
 void printCleaning(fileName& pathName)
 {
     Info<< "fileName = " << pathName << nl
         << "  path() = " << pathName.path() << nl
-        << "  name() = " << pathName.name() << nl << nl;
+        << "  name() = " << pathName.name() << nl
+        << "  joined = " << pathName.path()/pathName.name() << nl << nl;
 
-    fileNameCleanThis(pathName);
+    pathName.clean();
 
     Info<< "cleaned  = " << pathName << nl
         << "  path() = " << pathName.path() << nl
-        << "  name() = " << pathName.name() << nl << nl;
+        << "  name() = " << pathName.name() << nl
+        << "  joined = " << pathName.path()/pathName.name() << nl << nl;
 
     IOobject::writeDivider(Info);
 }
@@ -195,7 +77,14 @@ int main(int argc, char *argv[])
     if (args.optionFound("case"))
     {
         fileName pathName = args.option("case");
-        Info<< "-case\n";
+        Info<< nl
+            << "-case" << nl
+            << "path = " << args.path() << nl
+            << "root = " << args.rootPath() << nl
+            << "case = " << args.caseName() << nl
+            << "FOAM_CASE=" << getEnv("FOAM_CASE") << nl
+            << "FOAM_CASENAME=" << getEnv("FOAM_CASENAME") << nl
+            << endl;
 
         printCleaning(pathName);
     }
@@ -206,7 +95,6 @@ int main(int argc, char *argv[])
         printCleaning(pathName);
     }
 
-
     Info<< "\nEnd" << endl;
 
     return 0;
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index ac6dc75025..e157c15e34 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -55,18 +55,115 @@ Foam::fileName::Type Foam::fileName::type() const
 }
 
 
+//
+// * remove repeated slashes
+//       /abc////def        -->   /abc/def
+//
+// * remove '/./'
+//       /abc/def/./ghi/.   -->   /abc/def/./ghi
+//       abc/def/./         -->   abc/def
+//
+// * remove '/../'
+//       /abc/def/../ghi/jkl/nmo/..   -->   /abc/ghi/jkl
+//       abc/../def/ghi/../jkl        -->   abc/../def/jkl
+//
+// * remove trailing '/'
+//
 bool Foam::fileName::clean()
 {
-    bool changed = false;
+    // the top slash - we are never allowed to go above it
+    register string::size_type top = this->find('/');
 
-    changed = this->removeRepeated('/') || changed;
-    changed = this->removeTrailing('/') || changed;
+    // no slashes - nothing to do
+    if (top == string::npos)
+    {
+        return false;
+    }
 
-    return changed;
+    // start with the '/' found:
+    register char prev = '/';
+    register string::size_type nChar  = top+1;
+    register string::size_type maxLen = this->size();
+
+    for
+    (
+        register string::size_type src = nChar;
+        src < maxLen;
+        /*nil*/
+    )
+    {
+        register char c = operator[](src++);
+
+        if (prev == '/')
+        {
+            // repeated '/' - skip it
+            if (c == '/')
+            {
+                continue;
+            }
+
+            // could be '/./' or '/../'
+            if (c == '.')
+            {
+                // found trailing '/.' - skip it
+                if (src >= maxLen)
+                {
+                    continue;
+                }
+
+
+                // peek at the next character
+                register char c1 = operator[](src);
+
+                // found '/./' - skip it
+                if (c1 == '/')
+                {
+                    src++;
+                    continue;
+                }
+
+                // it is '/..' or '/../'
+                if (c1 == '.' && (src+1 >= maxLen || operator[](src+1) == '/'))
+                {
+                    string::size_type parent;
+
+                    // backtrack to find the parent directory
+                    // minimum of 3 characters:  '/x/../'
+                    // strip it, provided it is above the top point
+                    if
+                    (
+                        nChar > 2
+                     && (parent = this->rfind('/', nChar-2)) != string::npos
+                     && parent >= top
+                    )
+                    {
+                        nChar = parent + 1;   // retain '/' from the parent
+                        src += 2;
+                        continue;
+                    }
+
+                    // bad resolution, eg 'abc/../../'
+                    // retain the sequence, but move the top to avoid it being
+                    // considered a valid parent later
+                    top = nChar + 2;
+                }
+            }
+        }
+        operator[](nChar++) = prev = c;
+    }
+
+    // remove trailing slash
+    if (nChar > 1 && operator[](nChar-1) == '/')
+    {
+        nChar--;
+    }
+
+    this->resize(nChar);
+
+    return (nChar != maxLen);
 }
 
 
-// Return string with repeated characters removed
 Foam::fileName Foam::fileName::clean() const
 {
     fileName fName(*this);

From 4ebca298906a77adad175f738d79f9114157f34f Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Sun, 26 Jul 2009 13:04:03 +0200
Subject: [PATCH 09/15] argList: avoid relative cases ending in '..' - makes
 for very ugly names

- this stop problems caused by a "-case .." specification

  Previously  args.globalCaseName() + ".Ext"  resulted in silly names
  eg, "...png", or "surface-...stl"
---
 ReleaseNotes-1.6                      |  2 +
 src/OpenFOAM/global/argList/argList.C | 62 ++++++++++++++-------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6
index 7b6a086e92..bb09a0deff 100644
--- a/ReleaseNotes-1.6
+++ b/ReleaseNotes-1.6
@@ -147,6 +147,8 @@
       processing command-line options.
     + Export *new* environment variable =FOAM_CASENAME= that contains the
       name part of the =FOAM_CASE= environment variable
+    + Resolve relative cases ending in =..= to avoid potentially bad/ugly
+      case names being used.
 
 *** Misc. improvements
     + Improved consistency and interoperability between =face= and =triFace= classes.
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index 37caa6ddb3..16f216adf6 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -66,14 +66,14 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
 
     // note: we also re-write directly into args_
     // and use a second pass to sort out args/options
-    for (int argi=0; argi < argc; argi++)
+    for (int argI = 0; argI < argc; argI++)
     {
-        if (strcmp(argv[argi], "(") == 0)
+        if (strcmp(argv[argI], "(") == 0)
         {
             level++;
             tmpString += "(";
         }
-        else if (strcmp(argv[argi], ")") == 0)
+        else if (strcmp(argv[argI], ")") == 0)
         {
             if (level >= 1)
             {
@@ -87,19 +87,19 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
             }
             else
             {
-                args_[nArgs++] = argv[argi];
+                args_[nArgs++] = argv[argI];
             }
         }
         else if (level)
         {
             // quote each string element
             tmpString += "\"";
-            tmpString += argv[argi];
+            tmpString += argv[argI];
             tmpString += "\"";
         }
         else
         {
-            args_[nArgs++] = argv[argi];
+            args_[nArgs++] = argv[argI];
         }
     }
 
@@ -129,12 +129,18 @@ void Foam::argList::getRootCase()
         casePath = iter();
         casePath.clean();
 
-        // handle degenerate form and '-case .' like no -case specified
         if (casePath.empty() || casePath == ".")
         {
+            // handle degenerate form and '-case .' like no -case specified
             casePath = cwd();
             options_.erase("case");
         }
+        else if (casePath[0] != '/' && casePath.name() == "..")
+        {
+            // avoid relative cases ending in '..' - makes for very ugly names
+            casePath = cwd()/casePath;
+            casePath.clean();
+        }
     }
     else
     {
@@ -169,11 +175,11 @@ Foam::argList::argList
 {
     // Check if this run is a parallel run by searching for any parallel option
     // If found call runPar (might filter argv)
-    for (int argi=0; argi<argc; argi++)
+    for (int argI = 0; argI < argc; argI++)
     {
-        if (argv[argi][0] == '-')
+        if (argv[argI][0] == '-')
         {
-            const char *optionName = &argv[argi][1];
+            const char *optionName = &argv[argI][1];
 
             if (validParOptions.found(optionName))
             {
@@ -195,14 +201,14 @@ Foam::argList::argList
     int nArgs = 1;
     string argListString = args_[0];
 
-    for (int argi = 1; argi < args_.size(); argi++)
+    for (int argI = 1; argI < args_.size(); argI++)
     {
         argListString += ' ';
-        argListString += args_[argi];
+        argListString += args_[argI];
 
-        if (args_[argi][0] == '-')
+        if (args_[argI][0] == '-')
         {
-            const char *optionName = &args_[argi][1];
+            const char *optionName = &args_[argI][1];
 
             if
             (
@@ -216,8 +222,8 @@ Foam::argList::argList
                 )
             )
             {
-                argi++;
-                if (argi >= args_.size())
+                argI++;
+                if (argI >= args_.size())
                 {
                     FatalError
                         << "option " << "'-" << optionName << '\''
@@ -226,8 +232,8 @@ Foam::argList::argList
                 }
 
                 argListString += ' ';
-                argListString += args_[argi];
-                options_.insert(optionName, args_[argi]);
+                argListString += args_[argI];
+                options_.insert(optionName, args_[argI]);
             }
             else
             {
@@ -236,9 +242,9 @@ Foam::argList::argList
         }
         else
         {
-            if (nArgs != argi)
+            if (nArgs != argI)
             {
-                args_[nArgs] = args_[argi];
+                args_[nArgs] = args_[argI];
             }
             nArgs++;
         }
@@ -529,21 +535,19 @@ Foam::argList::argList
     // Set the case and case-name as an environment variable
     if (rootPath_[0] == '/')
     {
-        // absolute path
+        // absolute path - use as-is
         setEnv("FOAM_CASE", rootPath_/globalCase_, true);
-    }
-    else if (rootPath_ == ".")
-    {
-        // relative to the current working directory
-        setEnv("FOAM_CASE", cwd()/globalCase_, true);
+        setEnv("FOAM_CASENAME", globalCase_, true);
     }
     else
     {
         // qualify relative path
-        setEnv("FOAM_CASE", cwd()/rootPath_/globalCase_, true);
-    }
-    setEnv("FOAM_CASENAME", globalCase_, true);
+        fileName casePath = cwd()/rootPath_/globalCase_;
+        casePath.clean();
 
+        setEnv("FOAM_CASE", casePath, true);
+        setEnv("FOAM_CASENAME", casePath.name(), true);
+    }
 
     // Switch on signal trapping. We have to wait until after Pstream::init
     // since this sets up its own ones.

From 7fd14818e9a19648695b9c858567a77929b22739 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Mon, 27 Jul 2009 08:46:43 +0200
Subject: [PATCH 10/15] drop 'set -x' from top-level Allwmake - it's in the
 subordinate ones anyhow

- also gives better isolation between scripts
---
 Allwmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Allwmake b/Allwmake
index 6d98be3b84..c01c6c0d1a 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,6 +1,5 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-set -x
 
 # wmake is required for subsequent targets
 ( cd wmake/src && make )

From 1313dc091ba668d1aca97dfb34c8e6316ec11443 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Mon, 27 Jul 2009 18:17:57 +0100
Subject: [PATCH 11/15] fixing typo in injection specs

---
 .../filter/constant/parcelInjectionProperties               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties
index 56a5040225..4b87511c20 100644
--- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties
+++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/parcelInjectionProperties
@@ -16,9 +16,9 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 // x y z u v w d rho mDot T cp Y0..YN
 (
-    (0.1 0.32 0.0 0.5 0.25 0.0 0.001 1000 0.2 300 4200 1.0)
-    (0.1 0.44 0.0 0.5 0.1 0.0 0.001 1000 0.2 300 4200 1.0)
-    (0.1 0.56 0.0 0.5 -0.1.0 0.0 0.001 1000 0.2 300 4200 1.0)
+    (0.1 0.32 0.0 0.5  0.25 0.0 0.001 1000 0.2 300 4200 1.0)
+    (0.1 0.44 0.0 0.5  0.10 0.0 0.001 1000 0.2 300 4200 1.0)
+    (0.1 0.56 0.0 0.5 -0.10 0.0 0.001 1000 0.2 300 4200 1.0)
     (0.1 0.68 0.0 0.5 -0.25 0.0 0.001 1000 0.2 300 4200 1.0)
 );
 

From 33a13e6827c09a84595cdafb4960f8d56cbb1753 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 28 Jul 2009 13:14:42 +0200
Subject: [PATCH 12/15] fixed up .gitignore

- partial revert for
  commit 9557f2cb6e958eea7fdf99d7e9517bd1be7a45a9
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0639d63c1b..296f8d0367 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,9 @@ SiCortex*Gcc*/
 solaris*Gcc*/
 SunOS*Gcc*/
 
+# reinstate wmake/rules that might look like build folders
+!wmake/rules/*/
+
 # doxygen generated documentation
 doc/[Dd]oxygen/html
 doc/[Dd]oxygen/latex

From 1ec00de14ccc34cb0bd734b622e2055a448f579d Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 28 Jul 2009 12:35:26 +0100
Subject: [PATCH 13/15] and back to dev.....

---
 etc/bashrc | 2 +-
 etc/cshrc  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/bashrc b/etc/bashrc
index 0c460577e9..b4af75e716 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -33,7 +33,7 @@
 #------------------------------------------------------------------------------
 
 export WM_PROJECT=OpenFOAM
-export WM_PROJECT_VERSION=1.6
+export WM_PROJECT_VERSION=dev
 
 ################################################################################
 # USER EDITABLE PART
diff --git a/etc/cshrc b/etc/cshrc
index bc5f325dd6..39a5210ca0 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -32,7 +32,7 @@
 #------------------------------------------------------------------------------
 
 setenv WM_PROJECT OpenFOAM
-setenv WM_PROJECT_VERSION 1.6
+setenv WM_PROJECT_VERSION dev
 
 ################################################################################
 # USER EDITABLE PART

From 1089bbc69c02d5b86cd7ffcb522e48d10930f22a Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 29 Jul 2009 11:52:42 +0100
Subject: [PATCH 14/15] Corrected omega wall-function BCs.

---
 .../incompressible/simpleFoam/motorBike/0/k   | 25 +++++++++++++-
 .../simpleFoam/motorBike/0/omega              | 25 +++++++++++++-
 .../motorBike/0/turbulentBoundaryField        | 33 -------------------
 .../motorBike/constant/polyMesh/boundary      |  2 +-
 4 files changed, 49 insertions(+), 36 deletions(-)
 delete mode 100644 tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField

diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/k b/tutorials/incompressible/simpleFoam/motorBike/0/k
index 257b472da8..457efefed2 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/k
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/k
@@ -20,6 +20,29 @@ dimensions      [0 2 -2 0 0 0 0];
 
 internalField   uniform $turbulentKE;
 
-#include        "turbulentBoundaryField"
+boundaryField
+{
+    #include "fixedInlet"
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    lowerWall
+    {
+        type            kqRWallFunction;
+    }
+
+    "motorBike_.*"
+    {
+        type            kqRWallFunction;
+    }
+
+    #include "frontBackUpperPatches"
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/omega b/tutorials/incompressible/simpleFoam/motorBike/0/omega
index 94cbf590c2..16424f9bb3 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/0/omega
+++ b/tutorials/incompressible/simpleFoam/motorBike/0/omega
@@ -20,6 +20,29 @@ dimensions      [0 0 -1 0 0 0 0];
 
 internalField   uniform $turbulentOmega;
 
-#include        "turbulentBoundaryField"
+boundaryField
+{
+    #include "fixedInlet"
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+
+    lowerWall
+    {
+        type            omegaWallFunction;
+    }
+
+    "motorBike_.*"
+    {
+        type            omegaWallFunction;
+    }
+
+    #include "frontBackUpperPatches"
+}
+
 
 // ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField b/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField
deleted file mode 100644
index aa4e5eded9..0000000000
--- a/tutorials/incompressible/simpleFoam/motorBike/0/turbulentBoundaryField
+++ /dev/null
@@ -1,33 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-boundaryField
-{
-    #include "fixedInlet"
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
-
-    lowerWall
-    {
-        type            kqRWallFunction;
-    }
-
-    "motorBike_.*"
-    {
-        type            kqRWallFunction;
-    }
-
-    #include "frontBackUpperPatches"
-}
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
index e96b062da6..b79c6ad432 100644
--- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
+++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  dev                                   |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/

From 2d58cdf8ca26ef884eb7afb264005687b4011965 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 29 Jul 2009 12:52:06 +0100
Subject: [PATCH 15/15] Added a consistency check for the location of the
 installation.

---
 Allwmake              | 8 ++++++++
 applications/Allwmake | 9 +++++++++
 src/Allwmake          | 9 +++++++++
 3 files changed, 26 insertions(+)

diff --git a/Allwmake b/Allwmake
index c01c6c0d1a..ee6f075a0e 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,6 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
+if [ "$PWD" != "$WM_PROJECT_DIR" ]
+then
+    echo "Error: Current directory in not \$WM_PROJECT_DIR"
+    echo "    The environment variable are not consistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+fi
+
 # wmake is required for subsequent targets
 ( cd wmake/src && make )
 
diff --git a/applications/Allwmake b/applications/Allwmake
index 2a7eeae124..82a2ec0df4 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -1,5 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+
+if [ "$PWD" != "$WM_PROJECT_DIR/applications" ]
+then
+    echo "Error: Current directory in not \$WM_PROJECT_DIR/applications"
+    echo "    The environment variable are not consistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+fi
+
 set -x
 
 wmake all solvers
diff --git a/src/Allwmake b/src/Allwmake
index f2b2adf037..5473238ed3 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,5 +1,14 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+
+if [ "$PWD" != "$WM_PROJECT_DIR/src" ]
+then
+    echo "Error: Current directory in not \$WM_PROJECT_DIR/src"
+    echo "    The environment variable are not consistent with the installation."
+    echo "    Check the OpenFOAM entries in your dot-files and source them."
+    exit 1
+fi
+
 set -x
 
 # update OpenFOAM version strings if required