From ba8f1265e1b8e210bc5290abcad2bee0cc085b7a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Fri, 5 Jun 2020 16:08:27 +0200
Subject: [PATCH] CONFIG: update boost, cgal, openmpi versions (#1705)
- the CGAL version change is associated with a header-only build
(needs updated ThirdParty scripts).
- openmpi is a major version change (4.0.3)
---
etc/config.csh/CGAL | 13 ++++++-------
etc/config.csh/mpi | 2 +-
etc/config.csh/petsc | 9 ++++-----
etc/config.sh/CGAL | 13 ++++++-------
etc/config.sh/mpi | 2 +-
etc/config.sh/petsc | 9 ++++-----
6 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index f4aa8d1227f..9eab99eee85 100644
--- a/etc/config.csh/CGAL
+++ b/etc/config.csh/CGAL
@@ -6,11 +6,10 @@
# \\/ M anipulation |
#------------------------------------------------------------------------------
# Copyright (C) 2014-2016 OpenFOAM Foundation
-# Copyright (C) 2016-2018 OpenCFD Ltd.
+# Copyright (C) 2016-2020 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
-# This file is part of OpenFOAM, licensed under GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
#
# File
# etc/config.csh/CGAL
@@ -43,11 +42,11 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-set boost_version=boost_1_64_0
-set cgal_version=CGAL-4.9.1
+set boost_version=boost_1_66_0
+set cgal_version=CGAL-4.12.2
-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
+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"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 58e61af1d6d..76800e08681 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -55,7 +55,7 @@ case SYSTEMOPENMPI*:
breaksw
case OPENMPI:
- setenv FOAM_MPI openmpi-1.10.7
+ setenv FOAM_MPI openmpi-4.0.3
_foamEtc -config openmpi # <- Adjustments (optional)
# Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
diff --git a/etc/config.csh/petsc b/etc/config.csh/petsc
index 040821af017..fe6e74349a0 100644
--- a/etc/config.csh/petsc
+++ b/etc/config.csh/petsc
@@ -5,11 +5,10 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#------------------------------------------------------------------------------
-# Copyright (C) 2018 OpenCFD Ltd.
+# Copyright (C) 2018-2020 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
-# This file is part of OpenFOAM, licensed under GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
#
# File
# etc/config.csh/petsc
@@ -31,8 +30,8 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-set petsc_version=petsc-3.9.3
-setenv PETSC_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version
+set petsc_version=petsc-3.13.2
+setenv PETSC_ARCH_PATH "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 38014a26b47..ce985f1b241 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -6,11 +6,10 @@
# \\/ M anipulation |
#------------------------------------------------------------------------------
# Copyright (C) 2014-2016 OpenFOAM Foundation
-# Copyright (C) 2016-2018 OpenCFD Ltd.
+# Copyright (C) 2016-2020 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
-# This file is part of OpenFOAM, licensed under GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
#
# File
# etc/config.sh/CGAL
@@ -44,11 +43,11 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-boost_version=boost_1_64_0
-cgal_version=CGAL-4.9.1
+boost_version=boost_1_66_0
+cgal_version=CGAL-4.12.2
-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
+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"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 6d0cf4c6495..7e515bcfbf0 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -61,7 +61,7 @@ SYSTEMOPENMPI*)
;;
OPENMPI)
- export FOAM_MPI=openmpi-1.10.7
+ export FOAM_MPI=openmpi-4.0.3
_foamEtc -config openmpi # <- Adjustments (optional)
# Respect MPI_ARCH_PATH if set to valid directory (eg, user adjustments)
diff --git a/etc/config.sh/petsc b/etc/config.sh/petsc
index 75492913abf..f6976cbd602 100644
--- a/etc/config.sh/petsc
+++ b/etc/config.sh/petsc
@@ -5,11 +5,10 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#------------------------------------------------------------------------------
-# Copyright (C) 2018 OpenCFD Ltd.
+# Copyright (C) 2018-2020 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
-# This file is part of OpenFOAM, licensed under GNU General Public License
-# <http://www.gnu.org/licenses/>.
+# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
#
# File
# etc/config.sh/petsc
@@ -28,8 +27,8 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-petsc_version=petsc-3.9.3
-export PETSC_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version
+petsc_version=petsc-3.13.2
+export PETSC_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$petsc_version"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
--
GitLab