From c8717838f454a0906aadab6b3a2658b3a781a55f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Sep 2013 13:05:44 +0100
Subject: [PATCH 1/4] foamyQuadMesh/Allwmake: ensure
 foamyHexMesh/conformalVoronoiMesh is build before foamyQuadMesh

---
 applications/utilities/mesh/generation/foamyQuadMesh/Allwmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/applications/utilities/mesh/generation/foamyQuadMesh/Allwmake b/applications/utilities/mesh/generation/foamyQuadMesh/Allwmake
index 4fb5afda15..3620addd38 100755
--- a/applications/utilities/mesh/generation/foamyQuadMesh/Allwmake
+++ b/applications/utilities/mesh/generation/foamyQuadMesh/Allwmake
@@ -4,6 +4,7 @@ set -x
 
 if [ -d "$CGAL_ARCH_PATH" ]
 then
+    wmake libso ../foamyHexMesh/conformalVoronoiMesh
     wmake libso conformalVoronoi2DMesh
     wmake
 fi

From 88d4cca45b8da003f917de03667246fb434943e9 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Sep 2013 13:06:46 +0100
Subject: [PATCH 2/4] fvAgglomerationMethods/Allwmake: Better check for the
 availability of libMGridGen

---
 src/fvAgglomerationMethods/Allwmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index aa039078e9..abbcf4664b 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -5,7 +5,7 @@ set -x
 
 export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
 
-if [ -d "$ParMGridGen/MGridGen/Lib" ]
+if [ -e "$FOAM_LIBBIN/libMGridGen.so" ]
 then
     wmake $makeType MGridGenGamgAgglomeration
 fi

From 17fea4cabb3e71aaf28091322927ec26dec3e22f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 25 Sep 2013 13:08:33 +0100
Subject: [PATCH 3/4] Upgrade gcc and OpenMpi versions to the latest

---
 etc/config/settings.csh | 10 +++++-----
 etc/config/settings.sh  | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index c62918ea77..5fdee1186d 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -226,10 +226,10 @@ case ThirdParty:
         breaksw
     case Gcc48:
     case Gcc48++0x:
-        set gcc_version=gcc-4.8.0
-        set gmp_version=gmp-5.0.4
-        set mpfr_version=mpfr-3.1.0
-        set mpc_version=mpc-0.9
+        set gcc_version=gcc-4.8.1
+        set gmp_version=gmp-5.1.2
+        set mpfr_version=mpfr-3.1.2
+        set mpc_version=mpc-1.0.1
         breaksw
     case Gcc47:
     case Gcc47++0x:
@@ -397,7 +397,7 @@ case SYSTEMOPENMPI:
     breaksw
 
 case OPENMPI:
-    setenv FOAM_MPI openmpi-1.6.3
+    setenv FOAM_MPI openmpi-1.6.5
     # optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
 
diff --git a/etc/config/settings.sh b/etc/config/settings.sh
index 9dcc6ffe0c..ec67a7c000 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -247,10 +247,10 @@ OpenFOAM | ThirdParty)
         mpc_version=mpc-0.9
         ;;
     Gcc48 | Gcc48++0x)
-        gcc_version=gcc-4.8.0
-        gmp_version=gmp-5.0.4
-        mpfr_version=mpfr-3.1.0
-        mpc_version=mpc-0.9
+        gcc_version=gcc-4.8.1
+        gmp_version=gmp-5.1.2
+        mpfr_version=mpfr-3.1.2
+        mpc_version=mpc-1.0.1
         ;;
     Gcc47 | Gcc47++0x)
         gcc_version=gcc-4.7.2
@@ -418,7 +418,7 @@ SYSTEMOPENMPI)
     ;;
 
 OPENMPI)
-    export FOAM_MPI=openmpi-1.6.3
+    export FOAM_MPI=openmpi-1.6.5
     # optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
 

From 9a91037853af608b5090a29d81cf35ae98a9b03e Mon Sep 17 00:00:00 2001
From: Sergio Ferraris <sergio@alex.opencfd.co.uk>
Date: Thu, 26 Sep 2013 09:33:15 +0100
Subject: [PATCH 4/4] ENH: Adding limiter to the division of ft in function
 operator()() to avoid division by zero

---
 src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
index 9bdbaee7f6..051d1b2f1f 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -217,7 +217,7 @@ Foam::laminarFlameSpeedModels::Gulders::operator()() const
             dimensionedScalar
             (
                 psiuReactionThermo_.lookup("stoichiometricAirFuelMassRatio")
-            )*ft/((1 + SMALL) - ft)
+            )*ft/max(1 - ft, SMALL)
         );
     }
     else