From 3bd206da92d84c16faec0d9b4dfdd849250e4ac1 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 19 May 2015 14:21:11 +0100
Subject: [PATCH 1/5] CGAL: Upgrade to 4.6

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

diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh
index 5f7dceec..4357ea49 100644
--- a/etc/config/CGAL.csh
+++ b/etc/config/CGAL.csh
@@ -30,7 +30,7 @@
 ##------------------------------------------------------------------------------
 
 set boost_version=boost-system
-set cgal_version=CGAL-4.3
+set cgal_version=CGAL-4.6
 
 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh
index dc8772dd..51669636 100644
--- a/etc/config/CGAL.sh
+++ b/etc/config/CGAL.sh
@@ -30,7 +30,7 @@
 #------------------------------------------------------------------------------
 
 boost_version=boost-system
-cgal_version=CGAL-4.3
+cgal_version=CGAL-4.6
 
 export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version

From a253ceb33bb530aa10995d16e45e45cc074cbfee Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 19 May 2015 14:21:25 +0100
Subject: [PATCH 2/5] scotch: upgrade to 6.0.3

---
 etc/config/scotch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/config/scotch.sh b/etc/config/scotch.sh
index 1ee06e80..54d9578f 100644
--- a/etc/config/scotch.sh
+++ b/etc/config/scotch.sh
@@ -33,7 +33,7 @@
 #     during the wmake process
 #------------------------------------------------------------------------------
 
-export SCOTCH_VERSION=scotch_6.0.0
+export SCOTCH_VERSION=scotch_6.0.3
 export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$SCOTCH_VERSION
 
 # -----------------------------------------------------------------------------

From f5118272163b161aab3814b1cd7b8db6a0cb34f7 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 19 May 2015 14:21:46 +0100
Subject: [PATCH 3/5] OpenMPI: Upgrade to 1.8.5

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

diff --git a/etc/config/settings.csh b/etc/config/settings.csh
index e084af90..30c907f6 100644
--- a/etc/config/settings.csh
+++ b/etc/config/settings.csh
@@ -357,7 +357,7 @@ case SYSTEMOPENMPI:
     breaksw
 
 case OPENMPI:
-    setenv FOAM_MPI openmpi-1.6.5
+    setenv FOAM_MPI openmpi-1.8.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 ae529022..ea2b03b4 100644
--- a/etc/config/settings.sh
+++ b/etc/config/settings.sh
@@ -377,7 +377,7 @@ SYSTEMOPENMPI)
     ;;
 
 OPENMPI)
-    export FOAM_MPI=openmpi-1.6.5
+    export FOAM_MPI=openmpi-1.8.5
     # optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
 

From b9acd12c2918c617adea1b836c3a868daf23cfbb Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 19 May 2015 14:22:04 +0100
Subject: [PATCH 4/5] Update headers

---
 etc/config/CGAL.csh  | 2 +-
 etc/config/CGAL.sh   | 2 +-
 etc/config/scotch.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/config/CGAL.csh b/etc/config/CGAL.csh
index 4357ea49..96b5201c 100644
--- a/etc/config/CGAL.csh
+++ b/etc/config/CGAL.csh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/etc/config/CGAL.sh b/etc/config/CGAL.sh
index 51669636..7d495d01 100644
--- a/etc/config/CGAL.sh
+++ b/etc/config/CGAL.sh
@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2014 OpenFOAM Foundation
+#   \\  /    A nd           | Copyright (C) 2014-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
diff --git a/etc/config/scotch.sh b/etc/config/scotch.sh
index 54d9578f..87d93842 100644
--- a/etc/config/scotch.sh
+++ b/etc/config/scotch.sh
@@ -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-2015 OpenFOAM Foundation
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License

From cc267ba127a7e75531caca78e9efc038f017e77d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 19 May 2015 14:22:25 +0100
Subject: [PATCH 5/5] ptscotchDecomp: link scotch library to resolve undefined
 symbol

---
 src/parallel/decompose/ptscotchDecomp/Make/options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index acdebd89..25ca6e9d 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -9,4 +9,4 @@ EXE_INC = \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit ${LINK_FLAGS} -lrt
+    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lscotch ${LINK_FLAGS} -lrt