zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: update compiler versions

Browse Source
This commit is contained in:
Mark Olesen
2022-06-14 13:27:55 +02:00
parent 96ece1ef35
commit ea91261f59
4 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
etc/bashrc
View File

@ -80,7 +80,6 @@ export WM_LABEL_SIZE=32
# [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other: # [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other:
# = Opt | Debug | Prof # = Opt | Debug | Prof
# Other is processor or packaging specific (eg, OptKNL)
export WM_COMPILE_OPTION=Opt export WM_COMPILE_OPTION=Opt
# [WM_COMPILE_CONTROL] - additional control for compiler rules # [WM_COMPILE_CONTROL] - additional control for compiler rules

32
etc/config.csh/compiler
View File

@ -6,7 +6,7 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2016 OpenFOAM Foundation # Copyright (C) 2016 OpenFOAM Foundation
# Copyright (C) 2016-2021 OpenCFD Ltd. # Copyright (C) 2016-2022 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -26,6 +26,10 @@
# I_MPI_CC, I_MPI_CXX environment variables may be defined for the # I_MPI_CC, I_MPI_CXX environment variables may be defined for the
# Intel mpicc/mpicxx wrappers # Intel mpicc/mpicxx wrappers
# #
# Caveat
# Not all compiler versions listed here are necessarily currently tested,
# but can generally be expected to work.
#
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Initial mpi/compiler associations # Initial mpi/compiler associations
@ -69,6 +73,15 @@ case ThirdParty:
case Gcc: case Gcc:
set gcc_version="$default_gcc_version" set gcc_version="$default_gcc_version"
breaksw breaksw
case Gcc121*:
set gcc_version=gcc-12.1.0
breaksw
case Gcc113*:
set gcc_version=gcc-11.3.0
breaksw
case Gcc112*:
set gcc_version=gcc-11.2.0
breaksw
case Gcc111*: case Gcc111*:
set gcc_version=gcc-11.1.1 set gcc_version=gcc-11.1.1
breaksw breaksw
@ -81,6 +94,12 @@ case ThirdParty:
case Gcc101*: case Gcc101*:
set gcc_version=gcc-10.1.0 set gcc_version=gcc-10.1.0
breaksw breaksw
case Gcc95*:
set gcc_version=gcc-9.5.0
breaksw
case Gcc94*:
set gcc_version=gcc-9.4.0
breaksw
case Gcc93*: case Gcc93*:
set gcc_version=gcc-9.3.0 set gcc_version=gcc-9.3.0
breaksw breaksw
@ -90,6 +109,9 @@ case ThirdParty:
case Gcc91*: case Gcc91*:
set gcc_version=gcc-9.1.0 set gcc_version=gcc-9.1.0
breaksw breaksw
case Gcc85*:
set gcc_version=gcc-8.5.0
breaksw
case Gcc84*: case Gcc84*:
set gcc_version=gcc-8.4.0 set gcc_version=gcc-8.4.0
breaksw breaksw
@ -159,8 +181,14 @@ case ThirdParty:
case Clang: case Clang:
set clang_version="$default_clang_version" set clang_version="$default_clang_version"
breaksw breaksw
case Clang140*:
set clang_version=llvm-14.0.5
breaksw
case Clang130*:
set clang_version=llvm-13.0.1
breaksw
case Clang120*: case Clang120*:
set clang_version=llvm-12.0.0 set clang_version=llvm-12.0.1
breaksw breaksw
case Clang111*: case Clang111*:
set clang_version=llvm-11.1.0 set clang_version=llvm-11.1.0

16
etc/config.sh/compiler
View File

@ -6,7 +6,7 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Copyright (C) 2011-2016 OpenFOAM Foundation # Copyright (C) 2011-2016 OpenFOAM Foundation
# Copyright (C) 2016-2021 OpenCFD Ltd. # Copyright (C) 2016-2022 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later. # This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -26,6 +26,10 @@
# I_MPI_CC, I_MPI_CXX environment variables may be defined for the # I_MPI_CC, I_MPI_CXX environment variables may be defined for the
# Intel mpicc/mpicxx wrappers # Intel mpicc/mpicxx wrappers
# #
# Caveat
# Not all compiler versions listed here are necessarily currently tested,
# but can generally be expected to work.
#
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Initial mpi/compiler associations # Initial mpi/compiler associations
@ -70,13 +74,19 @@ ThirdParty)
case "$WM_COMPILER" in case "$WM_COMPILER" in
Gcc) gcc_version="$default_gcc_version" ;; Gcc) gcc_version="$default_gcc_version" ;;
Gcc121*) gcc_version=gcc-12.1.0 ;;
Gcc113*) gcc_version=gcc-11.3.0 ;;
Gcc112*) gcc_version=gcc-11.2.0 ;;
Gcc111*) gcc_version=gcc-11.1.1 ;; Gcc111*) gcc_version=gcc-11.1.1 ;;
Gcc103*) gcc_version=gcc-10.3.0 ;; Gcc103*) gcc_version=gcc-10.3.0 ;;
Gcc102*) gcc_version=gcc-10.2.0 ;; Gcc102*) gcc_version=gcc-10.2.0 ;;
Gcc101*) gcc_version=gcc-10.1.0 ;; Gcc101*) gcc_version=gcc-10.1.0 ;;
Gcc95*) gcc_version=gcc-9.5.0 ;;
Gcc94*) gcc_version=gcc-9.4.0 ;;
Gcc93*) gcc_version=gcc-9.3.0 ;; Gcc93*) gcc_version=gcc-9.3.0 ;;
Gcc92*) gcc_version=gcc-9.2.0 ;; Gcc92*) gcc_version=gcc-9.2.0 ;;
Gcc91*) gcc_version=gcc-9.1.0 ;; Gcc91*) gcc_version=gcc-9.1.0 ;;
Gcc85*) gcc_version=gcc-8.5.0 ;;
Gcc84*) gcc_version=gcc-8.4.0 ;; Gcc84*) gcc_version=gcc-8.4.0 ;;
Gcc83*) gcc_version=gcc-8.3.0 ;; Gcc83*) gcc_version=gcc-8.3.0 ;;
Gcc82*) gcc_version=gcc-8.2.0 ;; Gcc82*) gcc_version=gcc-8.2.0 ;;
@ -101,7 +111,9 @@ ThirdParty)
Gcc48*) gcc_version=gcc-4.8.5 ;; Gcc48*) gcc_version=gcc-4.8.5 ;;
Clang) clang_version="$default_clang_version" ;; Clang) clang_version="$default_clang_version" ;;
Clang120*) clang_version=llvm-12.0.0 ;; Clang140*) clang_version=llvm-14.0.5 ;;
Clang130*) clang_version=llvm-13.0.1 ;;
Clang120*) clang_version=llvm-12.0.1 ;;
Clang111*) clang_version=llvm-11.1.0 ;; Clang111*) clang_version=llvm-11.1.0 ;;
Clang110*) clang_version=llvm-11.0.1 ;; Clang110*) clang_version=llvm-11.0.1 ;;
Clang100*) clang_version=llvm-10.0.1 ;; Clang100*) clang_version=llvm-10.0.1 ;;

1
etc/cshrc
View File

@ -80,7 +80,6 @@ setenv WM_LABEL_SIZE 32
# [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other: # [WM_COMPILE_OPTION] - Optimised(default), debug, profiling, other:
# = Opt | Debug | Prof # = Opt | Debug | Prof
# Other is processor or packaging specific (eg, OptKNL)
setenv WM_COMPILE_OPTION Opt setenv WM_COMPILE_OPTION Opt
# [WM_COMPILE_CONTROL] - additional control for compiler rules # [WM_COMPILE_CONTROL] - additional control for compiler rules