From 1ed5b35049ba7d3ac059eba851d7287ff50a2df0 Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@Germany> Date: Mon, 20 Feb 2017 10:47:45 +0100 Subject: [PATCH] CONFIG: pass-through icc compiler choice for KNL, add gcc 6.3.0 - bump ADIOS version to 1.11.1 --- etc/bashrc | 4 ++-- etc/config.csh/ADIOS | 4 ++-- etc/config.csh/compiler | 7 +++++-- etc/config.sh/ADIOS | 4 ++-- etc/config.sh/compiler | 7 +++++-- etc/cshrc | 4 ++-- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 7eeb3c209aa..94e01d6a18a 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -3,7 +3,7 @@ # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation -# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. +# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM. @@ -61,7 +61,7 @@ export FOAM_INST_DIR export WM_COMPILER_TYPE=system #- Compiler: -# WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-2] | Clang | Icc +# WM_COMPILER= Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | Clang | Icc | IccKNL export WM_COMPILER=Gcc unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH diff --git a/etc/config.csh/ADIOS b/etc/config.csh/ADIOS index c53511fd8e7..efec3f760fb 100644 --- a/etc/config.csh/ADIOS +++ b/etc/config.csh/ADIOS @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. +# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -48,7 +48,7 @@ # #------------------------------------------------------------------------------ -set adios_version=ADIOS-1.11.0 +set adios_version=ADIOS-1.11.1 setenv ADIOS_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version #------------------------------------------------------------------------------ diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler index 751c5bada48..18b2f226c89 100644 --- a/etc/config.csh/compiler +++ b/etc/config.csh/compiler @@ -3,7 +3,7 @@ # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | # \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation -# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. +# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM. @@ -63,6 +63,9 @@ case ThirdParty: case Gcc62: set gcc_version=gcc-6.2.0 breaksw + case Gcc63: + set gcc_version=gcc-6.3.0 + breaksw case Clang: set clang_version=llvm-3.7.0 # set clang_version=llvm-3.8.0 @@ -84,7 +87,7 @@ case Clang: setenv WM_CC 'clang' setenv WM_CXX 'clang++' breaksw -case Icc: +case Icc*: setenv WM_CC 'icc' setenv WM_CXX 'icpc' breaksw diff --git a/etc/config.sh/ADIOS b/etc/config.sh/ADIOS index 898a2bc28da..db7b3534a61 100644 --- a/etc/config.sh/ADIOS +++ b/etc/config.sh/ADIOS @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. +# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -47,7 +47,7 @@ # #------------------------------------------------------------------------------ -adios_version=ADIOS-1.11.0 +adios_version=ADIOS-1.11.1 export ADIOS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version #------------------------------------------------------------------------------ diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler index de903a07679..1f9907710b3 100644 --- a/etc/config.sh/compiler +++ b/etc/config.sh/compiler @@ -3,7 +3,7 @@ # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation -# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. +# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM. @@ -62,6 +62,9 @@ ThirdParty) Gcc62) gcc_version=gcc-6.2.0 ;; + Gcc63) + gcc_version=gcc-6.3.0 + ;; Clang) clang_version=llvm-3.7.0 # clang_version=llvm-3.8.0 @@ -84,7 +87,7 @@ Clang) export WM_CC='clang' export WM_CXX='clang++' ;; -Icc) +Icc*) export WM_CC='icc' export WM_CXX='icpc' ;; diff --git a/etc/cshrc b/etc/cshrc index 0352fe8a6da..3e644242c24 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -3,7 +3,7 @@ # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation -# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. +# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM. @@ -60,7 +60,7 @@ setenv FOAM_INST_DIR `lsof +p $$ |& grep -oE '/.*'$WM_PROJECT'[^/]*/etc/cshrc' | setenv WM_COMPILER_TYPE system #- Compiler: -# WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-2] | Clang | Icc +# WM_COMPILER= Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | Clang | Icc | IccKNL setenv WM_COMPILER Gcc setenv WM_COMPILER_ARCH # defined but empty unsetenv WM_COMPILER_LIB_ARCH -- GitLab