From 1255b6a88626982f1590b4d8d390f10098135e3c Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 23 Apr 2015 13:51:07 +0100
Subject: [PATCH] Script clean-up: FOAM

---
 etc/aliases.csh           |  4 +--
 etc/aliases.sh            |  4 +--
 etc/apps/ensight/bashrc   |  2 +-
 etc/apps/ensight/cshrc    |  4 +--
 etc/apps/paraview3/bashrc |  2 +-
 etc/apps/paraview3/cshrc  |  2 +-
 etc/bashrc                |  6 ++--
 etc/controlDict           |  2 +-
 etc/cshrc                 |  2 +-
 etc/prefs.csh-EXAMPLE     | 13 ++++----
 etc/prefs.sh-EXAMPLE      | 13 ++++----
 etc/settings.csh          | 62 ++++++++++++++++++++----------------
 etc/settings.sh           | 66 ++++++++++++++++++++++-----------------
 13 files changed, 100 insertions(+), 82 deletions(-)
 mode change 100755 => 100644 etc/settings.sh

diff --git a/etc/aliases.csh b/etc/aliases.csh
index 8beb1b3c2..0c80acbb5 100644
--- a/etc/aliases.csh
+++ b/etc/aliases.csh
@@ -25,8 +25,8 @@
 #     aliases.csh
 #
 # Description
-#     Aliases for working with OpenFOAM
-#     Sourced from OpenFOAM-??/etc/cshrc and/or ~/.cshrc
+#     Aliases for working with FOAM
+#     Sourced from FOAM-??/etc/cshrc and/or ~/.cshrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/aliases.sh b/etc/aliases.sh
index e25c0e0d1..603f34896 100644
--- a/etc/aliases.sh
+++ b/etc/aliases.sh
@@ -25,8 +25,8 @@
 #     aliases.sh
 #
 # Description
-#     Aliases for working with OpenFOAM
-#     Sourced from OpenFOAM-??/etc/bashrc and/or ~/.bashrc
+#     Aliases for working with FOAM
+#     Sourced from FOAM-??/etc/bashrc and/or ~/.bashrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/apps/ensight/bashrc b/etc/apps/ensight/bashrc
index c60fcab84..e719aeadc 100644
--- a/etc/apps/ensight/bashrc
+++ b/etc/apps/ensight/bashrc
@@ -26,7 +26,7 @@
 #
 # Description
 #     Setup file for Ensight 8.?
-#     Sourced from OpenFOAM-?.?/etc/bashrc
+#     Sourced from FOAM-?.?/etc/bashrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/apps/ensight/cshrc b/etc/apps/ensight/cshrc
index 5e58b2261..71b244478 100644
--- a/etc/apps/ensight/cshrc
+++ b/etc/apps/ensight/cshrc
@@ -4,7 +4,7 @@
 #  \\    /   O peration     |
 #   \\  /    A nd           | For copyright notice see file Copyright
 #    \\/     M anipulation  |
-#-------------------------------------------------------------------------------
+#------------------------------------------------------------------------------
 # License
 #     This file is part of foam-extend.
 #
@@ -26,7 +26,7 @@
 #
 # Description
 #     Startup File for Ensight 8.?.
-#     Sourced from OpenFOAM-?.?/etc/cshrc
+#     Sourced from FOAM-?.?/etc/cshrc
 #
 #------------------------------------------------------------------------------
 
diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc
index 14b2a15ae..7f67fe6b0 100644
--- a/etc/apps/paraview3/bashrc
+++ b/etc/apps/paraview3/bashrc
@@ -26,7 +26,7 @@
 #
 # Description
 #     Setup file for paraview-3.x
-#     Sourced from OpenFOAM-*/etc/bashrc
+#     Sourced from FOAM-*/etc/bashrc
 #
 # Note
 #     The env. variable 'ParaView_DIR' is required for building plugins
diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc
index 726f4826b..2e2fdafa9 100644
--- a/etc/apps/paraview3/cshrc
+++ b/etc/apps/paraview3/cshrc
@@ -26,7 +26,7 @@
 #
 # Description
 #     Setup file for paraview-3.x
-#     Sourced from OpenFOAM-*/etc/cshrc
+#     Sourced from FOAM-*/etc/cshrc
 #
 # Note
 #     The env. variable 'ParaView_DIR' is required for building plugins
diff --git a/etc/bashrc b/etc/bashrc
index dfb9ada4b..479f0a88e 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -26,7 +26,7 @@
 #     etc/bashrc
 #
 # Description
-#     Startup file for OpenFOAM
+#     Startup file for FOAM
 #     Sourced from ~/.profile or ~/.bashrc
 #     Should be usable by any POSIX-compliant shell (eg, ksh)
 #
@@ -43,7 +43,7 @@ export FOAM_DEV=1
 # USER EDITABLE PART
 #
 # either set $FOAM_INST_DIR before sourcing this file or set
-#    $foamInstall below to where OpenFOAM is installed
+#    $foamInstall below to where FOAM is installed
 #
 # Location of FOAM installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -379,7 +379,7 @@ SunOS)
     cat <<USAGE
 
     Your "$WM_ARCH" operating system is not supported by this release
-    of OpenFOAM. For further assistance, please contact www.extend-project.de
+    of foam-extend. For further assistance, please contact www.foam-extend.org
 
 USAGE
     ;;
diff --git a/etc/controlDict b/etc/controlDict
index 851b83a2c..26ce32518 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -22,7 +22,7 @@ Documentation
     doxyDocDirs
     (
         "$WM_PROJECT_USER_DIR/Doxygen/html"
-        "~OpenFOAM/Doxygen/html"
+        "~foam/Doxygen/html"
         "$WM_PROJECT_DIR/doc/Doxygen/html"
     );
     doxySourceFileExts
diff --git a/etc/cshrc b/etc/cshrc
index 9a68d48cb..e9d885048 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -25,7 +25,7 @@
 #     etc/cshrc
 #
 # Description
-#     Startup file for OpenFOAM
+#     Startup file for FOAM
 #     Sourced from ~/.login or ~/.cshrc
 #
 #------------------------------------------------------------------------------
diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE
index c2b1e2223..eab032de1 100644
--- a/etc/prefs.csh-EXAMPLE
+++ b/etc/prefs.csh-EXAMPLE
@@ -25,16 +25,17 @@
 #     etc/prefs.csh
 #
 # Description
-#     Preset variables for the OpenFOAM configuration - C-Shell shell syntax.
+#     Preset variables for the FOAM configuration - C-Shell shell syntax.
 #
-#     The prefs.csh file will be sourced by the OpenFOAM etc/cshrc when it is
+#     The prefs.csh file will be sourced by the FOAM etc/cshrc when it is
 #     found
 #
 #------------------------------------------------------------------------------
 
 ## Specify system compiler
 ## ~~~~~~~~~~~~~~~~~~~~~~~
-#set compilerInstall=system
+#set compilerInstall=System
+#set compilerInstall=FOAM
 
 # Specify system openmpi
 # ~~~~~~~~~~~~~~~~~~~~~~
@@ -161,11 +162,11 @@
 #setenv ParaView_MAJOR 3.7
 
 
-# System identifier for the OpenFOAM CDash test harness on openfoam-extend
+# System identifier for the FOAM CDash test harness on foam-extend
 #
 # By default, your system FQN/hostname will be used as the system identifier
-# when publishing your test harness results on the OpenFOAM CDash server
-# on openfoam-extend.
+# when publishing your test harness results on the FOAM CDash server
+# on foam-extend.
 # You can override your identifier using this environment variable
 #setenv CDASH_SUBMIT_LOCAL_HOST_ID choose_your_CDash_system_identifer
 
diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE
index cc8fdd202..99d56a201 100644
--- a/etc/prefs.sh-EXAMPLE
+++ b/etc/prefs.sh-EXAMPLE
@@ -25,9 +25,9 @@
 #     etc/prefs.sh
 #
 # Description
-#     Preset variables for the OpenFOAM configuration - POSIX shell syntax.
+#     Preset variables for the FOAM configuration - POSIX shell syntax.
 #
-#     The prefs.sh file will be sourced by the OpenFOAM etc/bashrc when it is
+#     The prefs.sh file will be sourced by the FOAM etc/bashrc when it is
 #     found
 #
 #------------------------------------------------------------------------------
@@ -36,7 +36,8 @@ export FOAM_VERBOSE=1
 
 # Specify system compiler
 # ~~~~~~~~~~~~~~~~~~~~~~~
-compilerInstall=System
+#compilerInstall=System
+#compilerInstall=FOAM
 
 # Specify system openmpi
 # ~~~~~~~~~~~~~~~~~~~~~~
@@ -171,11 +172,11 @@ compilerInstall=System
 #export ParaView_MAJOR=3.7
 
 
-# System identifier for the OpenFOAM CDash test harness on openfoam-extend
+# System identifier for the FOAM CDash test harness on foam-extend
 #
 # By default, your system FQN/hostname will be used as the system identifier
-# when publishing your test harness results on the OpenFOAM CDash server
-# on openfoam-extend.
+# when publishing your test harness results on the FOAM CDash server
+# on foam-extend.
 # You can override your identifier using this environment variable
 #export CDASH_SUBMIT_LOCAL_HOST_ID=choose_your_CDash_system_identifer
 
diff --git a/etc/settings.csh b/etc/settings.csh
index 3f647f90c..365197b45 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -25,8 +25,8 @@
 #     etc/settings.csh
 #
 # Description
-#     Startup file for OpenFOAM
-#     Sourced from OpenFOAM-??/etc/cshrc
+#     Startup file for FOAM
+#     Sourced from FOAM-??/etc/cshrc
 #
 #------------------------------------------------------------------------------
 
@@ -51,7 +51,7 @@ setenv FOAM_LIB $WM_PROJECT_DIR/lib
 setenv FOAM_LIBBIN $WM_PROJECT_DIR/lib/$WM_OPTIONS
 setenv FOAM_SRC $WM_PROJECT_DIR/src
 
-# shared site configuration - similar naming convention as ~OpenFOAM expansion
+# shared site configuration - similar naming convention as ~FOAM expansion
 setenv FOAM_SITE_APPBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
 setenv FOAM_SITE_LIBBIN $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
 
@@ -65,7 +65,7 @@ setenv FOAM_UTILITIES $FOAM_APP/utilities
 setenv FOAM_SOLVERS $FOAM_APP/solvers
 setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
 
-# add OpenFOAM scripts and wmake to the path
+# add FOAM scripts and wmake to the path
 set path=($WM_DIR $WM_PROJECT_DIR/bin $path)
 
 _foamAddPath $FOAM_APPBIN
@@ -80,41 +80,49 @@ _foamAddLib  $FOAM_USER_LIBBIN
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# compilerInstall = OpenFOAM | System
-#set compilerInstall=OpenFOAM
+# compilerInstall = FOAM | System
+#set compilerInstall=FOAM
 #set compilerInstall=System
 if ( ! $?compilerInstall ) then
     setenv compilerInstall System
 endif
 
 switch ("$compilerInstall")
-case OpenFOAM:
+case FOAM:
     switch ("$WM_COMPILER")
     case Gcc:
-        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/packages/gcc-4.6.4/platforms/$WM_OPTIONS
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.6.4/platforms/$WM_OPTIONS/etc/gcc-4.6.4.csh
+    breaksw
+    case Gcc49:
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS/etc/gcc-4.9.2.csh
+    breaksw
+    case Gcc47:
+        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/packages/gcc-4.7.4/platforms/$WM_OPTIONS
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.7.4/platforms/$WM_OPTIONS/etc/gcc-4.7.4.csh
     breaksw
     case Gcc45:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/packages/gcc-4.5.1/platforms/$WM_OPTIONS
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.csh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.csh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/mpc-0.8.2/platforms/$WM_OPTIONS/etc/mpc-0.8.2.csh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gcc-4.5.1/platforms/$WM_OPTIONS/etc/gcc-4.5.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-0.8.2/platforms/$WM_OPTIONS/etc/mpc-0.8.2.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.5.1/platforms/$WM_OPTIONS/etc/gcc-4.5.1.csh
     breaksw
     case Gcc44:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.csh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.csh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS/etc/gcc-4.4.5.csh
-    breaksw
-    case Gcc43:
-        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-    breaksw
-    case Gcc42:
-        setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.csh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS/etc/gcc-4.4.5.csh
     breaksw
     endsw
 
@@ -530,8 +538,8 @@ endif
 
 # QT
 # ~~~~~
-if ( $?QT_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS )then
-    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.5.csh
+if ( $?QT_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS )then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.6.csh
 endif
 
 # PARAVIEW
diff --git a/etc/settings.sh b/etc/settings.sh
old mode 100755
new mode 100644
index ee7e29f79..19cf15ba9
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -26,8 +26,8 @@
 #     etc/settings.sh
 #
 # Description
-#     Startup file for OpenFOAM
-#     Sourced from OpenFOAM-??/etc/bashrc
+#     Startup file for FOAM
+#     Sourced from FOAM-??/etc/bashrc
 #
 #------------------------------------------------------------------------------
 
@@ -89,7 +89,7 @@ export FOAM_LIB=$WM_PROJECT_DIR/lib
 export FOAM_LIBBIN=$WM_PROJECT_DIR/lib/$WM_OPTIONS
 export FOAM_SRC=$WM_PROJECT_DIR/src
 
-# shared site configuration - similar naming convention as ~OpenFOAM expansion
+# shared site configuration - similar naming convention as ~FOAM expansion
 export FOAM_SITE_APPBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/bin/$WM_OPTIONS
 export FOAM_SITE_LIBBIN=$WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION/lib/$WM_OPTIONS
 
@@ -103,7 +103,7 @@ export FOAM_UTILITIES=$FOAM_APP/utilities
 export FOAM_SOLVERS=$FOAM_APP/solvers
 export FOAM_RUN=$WM_PROJECT_USER_DIR/run
 
-# add OpenFOAM scripts and wmake to the path
+# add FOAM scripts and wmake to the path
 export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
 
 _foamAddPath $FOAM_APPBIN $FOAM_SITE_APPBIN $FOAM_USER_APPBIN
@@ -118,43 +118,51 @@ unset compilerBin compilerLib
 
 # Select compiler installation
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# compilerInstall = OpenFOAM | System
+# compilerInstall = FOAM | System
 #
 # We can override the value of compilerInstall from prefs.sh
 : ${compilerInstall:=System}
 
 # Or we can force it right here
-#compilerInstall=OpenFOAM
+#compilerInstall=FOAM
 #compilerInstall=System
 
-case "${compilerInstall:-OpenFOAM}" in
-OpenFOAM)
+case "${compilerInstall}" in
+FOAM)
     case "$WM_COMPILER" in
     Gcc)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.6.4/platforms/$WM_OPTIONS
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.6.4/platforms/$WM_OPTIONS/etc/gcc-4.6.4.csh
+        ;;
+    Gcc49)
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS/etc/gcc-4.9.2.csh
+        ;;
+    Gcc47)
+        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.7.4/platforms/$WM_OPTIONS
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.7.4/platforms/$WM_OPTIONS/etc/gcc-4.7.4.csh
         ;;
     Gcc45)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.5.1/platforms/$WM_OPTIONS
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.sh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.sh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/mpc-0.8.2/platforms/$WM_OPTIONS/etc/mpc-0.8.2.sh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gcc-4.5.1/platforms/$WM_OPTIONS/etc/gcc-4.5.1.sh
-    ;;
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-0.8.2/platforms/$WM_OPTIONS/etc/mpc-0.8.2.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.5.1/platforms/$WM_OPTIONS/etc/gcc-4.5.1.sh
+        ;;
     Gcc44)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.sh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.sh
-        _foamSource  $WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS/etc/gcc-4.4.5.sh
-        ;;
-    Gcc43)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
-        ;;
-    Gcc42)
-        export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.0.1/platforms/$WM_OPTIONS/etc/gmp-5.0.1.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.0.1/platforms/$WM_OPTIONS/etc/mpfr-3.0.1.sh
+        _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.4.5/platforms/$WM_OPTIONS/etc/gcc-4.4.5.sh
         ;;
     esac
 
@@ -641,8 +649,8 @@ export MPI_BUFFER_SIZE
 
 # Load QT
 # ~~~~~~~
-[ ! -z "$QT_THIRD_PARTY" ] && [ -e $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS ] && {
-    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.5.sh
+[ ! -z "$QT_THIRD_PARTY" ] && [ -e $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.6.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    QT_DIR is initialized to: $QT_DIR"