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: list Clang37 as well for ThirdParty clang

Browse Source 
- for Darwin, mention that clang is the only compiler configured

- adjust comments
This commit is contained in:
Mark Olesen
2018-06-15 09:06:06 +02:00
parent d77df7aa11
commit 01f76d7d55
6 changed files with 57 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
etc/bashrc
View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -13,23 +13,21 @@
# etc/bashrc # etc/bashrc
# #
# Description # Description
# Set OpenFOAM environment for POSIX shell (eg, bash,dash,zsh,...) # The OpenFOAM environment for POSIX shell (eg, bash,dash,zsh,...).
# Source manually or from the ~/.profile or ~/.bashrc files. # Source manually or from the ~/.bashrc or ~/.profile files.
# #
# Note # Many settings can be overridden using a <prefs.sh> file:
# Many environment variables can be overridden using a <prefs.sh> file
# from one of these locations:
# * user-specific:
# * ~/.OpenFOAM/$WM_PROJECT_VERSION
# * ~/.OpenFOAM
# * group-specific:
# * $WM_PROJECT_SITE/site/$WM_PROJECT_VERSION
# * $WM_PROJECT_SITE/site
# * general:
# * $WM_PROJECT_DIR/etc
# #
# Any changes made to this bashrc file may be lost with the next upgrade. # - Base values (eg, from system admin):
# - $WM_PROJECT_DIR/etc/prefs.sh
# #
# - User or group values (first file found):
# - ~/.OpenFOAM/$WM_PROJECT_VERSION/prefs.sh
# - ~/.OpenFOAM/prefs.sh
# - $WM_PROJECT_SITE/site/$WM_PROJECT_VERSION/prefs.sh
# - $WM_PROJECT_SITE/site/prefs.sh
#
# Note: Changes made to this bashrc file may be lost with the next upgrade.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM export WM_PROJECT=OpenFOAM
@ -52,8 +50,8 @@ FOAM_INST_DIR=$HOME/$WM_PROJECT
export FOAM_INST_DIR export FOAM_INST_DIR
unset rc unset rc
# Default environment variables. # Configuration environment variables.
# Can override with a <prefs.sh> file instead of editing below. # Should override via <prefs.sh> file instead of editing this file.
# [WM_COMPILER_TYPE] - Compiler location: # [WM_COMPILER_TYPE] - Compiler location:
# = system | ThirdParty # = system | ThirdParty
@ -61,7 +59,7 @@ export WM_COMPILER_TYPE=system
# [WM_COMPILER] - Compiler: # [WM_COMPILER] - Compiler:
# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[1] | GccKNL | # = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[1] | GccKNL |
# Clang | Clang3[8-9] | Clang[4-6]0 | Icc | IccKNL | Cray | Arm # Clang | Clang3[7-9] | Clang[4-6]0 | Icc | IccKNL | Cray | Arm
export WM_COMPILER=Gcc export WM_COMPILER=Gcc
# [WM_ARCH_OPTION] - Memory addressing: # [WM_ARCH_OPTION] - Memory addressing:
@ -88,12 +86,15 @@ export WM_COMPILE_OPTION=Opt
export WM_MPLIB=SYSTEMOPENMPI export WM_MPLIB=SYSTEMOPENMPI
# [FOAM_SIGFPE] - Trapping of floating-point exceptions. #------------------------------------------------------------------------------
# (legacy / advanced)
#
# [FOAM_SIGFPE] - Trap floating-point exceptions.
# - overrides the 'trapFpe' controlDict entry # - overrides the 'trapFpe' controlDict entry
# = true | false # = true | false
#export FOAM_SIGFPE=true #export FOAM_SIGFPE=true
# [FOAM_SETNAN] - Memory initialisation as NaN # [FOAM_SETNAN] - Initialize memory with NaN
# - overrides the 'setNaN' controlDict entry # - overrides the 'setNaN' controlDict entry
# = true | false # = true | false
#export FOAM_SETNAN=false #export FOAM_SETNAN=false
@ -129,10 +130,9 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
# Load shell functions # Load shell functions
. $WM_PROJECT_DIR/etc/config.sh/functions . $WM_PROJECT_DIR/etc/config.sh/functions
# Override definitions via prefs, with 'other' first so the sys-admin # Overrides via <prefs.sh>
# can provide base values independent of WM_PROJECT_SITE _foamEtc -mode=o prefs.sh # 1) other (system) values
_foamEtc -mode=o prefs.sh _foamEtc -mode=ug prefs.sh # 2) user or group values
_foamEtc -mode=ug prefs.sh
# Evaluate command-line parameters and record settings for later. # Evaluate command-line parameters and record settings for later.
# These can be used to set/unset values, specify additional files etc. # These can be used to set/unset values, specify additional files etc.

3
etc/config.csh/compiler
View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -73,6 +73,7 @@ case ThirdParty:
set gcc_version=gcc-8.1.0 set gcc_version=gcc-8.1.0
breaksw breaksw
case Clang: case Clang:
case Clang37:
set clang_version=llvm-3.7.1 set clang_version=llvm-3.7.1
breaksw breaksw
case Clang38: case Clang38:

4
etc/config.csh/settings
View File

@ -106,9 +106,11 @@ case Linux:
case Darwin: # Presumably x86_64 case Darwin: # Presumably x86_64
if (! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64 # Default to 64-bit if (! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64 # Default to 64-bit
setenv WM_ARCH darwin64 setenv WM_ARCH darwin64
setenv WM_CFLAGS "$WM_CFLAGS -m64 -Ddarwin"
setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64 -Ddarwin"
/bin/cat << INCOMPLETE /bin/cat << INCOMPLETE
=============================================================================== ===============================================================================
Operating system '$WM_ARCH' has incomplete support in this OpenFOAM release. Darwin support (clang only) is incomplete or untested in this OpenFOAM release.
For further assistance, please contact www.OpenFOAM.com For further assistance, please contact www.OpenFOAM.com
=============================================================================== ===============================================================================
INCOMPLETE INCOMPLETE

4
etc/config.sh/compiler
View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration | # \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation # \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM, licensed under GNU General Public License # This file is part of OpenFOAM, licensed under GNU General Public License
@ -71,7 +71,7 @@ ThirdParty)
Gcc81) Gcc81)
gcc_version=gcc-8.1.0 gcc_version=gcc-8.1.0
;; ;;
Clang) Clang | Clang37)
clang_version=llvm-3.7.1 clang_version=llvm-3.7.1
;; ;;
Clang38) Clang38)

4
etc/config.sh/settings
View File

@ -100,9 +100,11 @@ Linux)
Darwin) # Presumably x86_64 Darwin) # Presumably x86_64
: ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION # Default to 64-bit : ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION # Default to 64-bit
WM_ARCH=darwin64 WM_ARCH=darwin64
export WM_CFLAGS="$WM_CFLAGS -m64 -Ddarwin"
export WM_CXXFLAGS="$WM_CXXFLAGS -m64 -Ddarwin"
/bin/cat << INCOMPLETE 1>&2 /bin/cat << INCOMPLETE 1>&2
=============================================================================== ===============================================================================
Operating system '$WM_ARCH' has incomplete support in this OpenFOAM release. Darwin support (clang only) is incomplete or untested in this OpenFOAM release.
For further assistance, please contact www.OpenFOAM.com For further assistance, please contact www.OpenFOAM.com
=============================================================================== ===============================================================================
INCOMPLETE INCOMPLETE

46
etc/cshrc
View File

@ -13,23 +13,21 @@
# etc/cshrc # etc/cshrc
# #
# Description # Description
# Set OpenFOAM environment for C-shell (csh, tcsh). # The OpenFOAM environment for C-shell (csh, tcsh).
# Source manually or from the ~/.login or ~/.cshrc files. # Source manually or from the ~/.cshrc or ~/.login files.
# #
# Note # Many settings can be overridden using a <prefs.csh> file:
# Many environment variables can be overridden using a <prefs.csh> file
# from one of these locations:
# * user-specific:
# * ~/.OpenFOAM/$WM_PROJECT_VERSION
# * ~/.OpenFOAM
# * group-specific:
# * $WM_PROJECT_SITE/site/$WM_PROJECT_VERSION
# * $WM_PROJECT_SITE/site
# * general:
# * $WM_PROJECT_DIR/etc
# #
# Any changes made to this cshrc file may be lost with the next upgrade. # - Base values (eg, from system admin):
# - $WM_PROJECT_DIR/etc/prefs.csh
# #
# - User or group values (first file found):
# - ~/.OpenFOAM/$WM_PROJECT_VERSION/prefs.csh
# - ~/.OpenFOAM/prefs.csh
# - $WM_PROJECT_SITE/site/$WM_PROJECT_VERSION/prefs.csh
# - $WM_PROJECT_SITE/site/prefs.csh
#
# Note: Changes made to this cshrc file may be lost with the next upgrade.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM setenv WM_PROJECT OpenFOAM
@ -49,8 +47,8 @@ setenv FOAM_INST_DIR `lsof +p $$ |& \
# END OF (NORMAL) USER EDITABLE PART # END OF (NORMAL) USER EDITABLE PART
################################################################################ ################################################################################
# Default environment variables. # Configuration environment variables.
# Can override with a <prefs.sh> file instead of editing below. # Should override via <prefs.csh> file instead of editing this file.
# [WM_COMPILER_TYPE] - Compiler location: # [WM_COMPILER_TYPE] - Compiler location:
# = system | ThirdParty # = system | ThirdParty
@ -58,7 +56,7 @@ setenv WM_COMPILER_TYPE system
# [WM_COMPILER] - Compiler: # [WM_COMPILER] - Compiler:
# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[1] | GccKNL | # = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-3] | Gcc8[1] | GccKNL |
# Clang | Clang3[8-9] | Clang[4-6]0 | Icc | IccKNL | Cray | Arm # Clang | Clang3[7-9] | Clang[4-6]0 | Icc | IccKNL | Cray | Arm
setenv WM_COMPILER Gcc setenv WM_COMPILER Gcc
# [WM_ARCH_OPTION] - Memory addressing: # [WM_ARCH_OPTION] - Memory addressing:
@ -85,12 +83,15 @@ setenv WM_COMPILE_OPTION Opt
setenv WM_MPLIB SYSTEMOPENMPI setenv WM_MPLIB SYSTEMOPENMPI
# [FOAM_SIGFPE] - Trapping of floating-point exceptions. #------------------------------------------------------------------------------
# (legacy / advanced)
#
# [FOAM_SIGFPE] - Trap floating-point exceptions.
# - overrides the 'trapFpe' controlDict entry # - overrides the 'trapFpe' controlDict entry
# = true | false # = true | false
#setenv FOAM_SIGFPE true #setenv FOAM_SIGFPE true
# [FOAM_SETNAN] - Memory initialisation as NaN # [FOAM_SETNAN] - Initialize memory with NaN
# - overrides the 'setNaN' controlDict entry # - overrides the 'setNaN' controlDict entry
# = true | false # = true | false
#setenv FOAM_SETNAN false #setenv FOAM_SETNAN false
@ -139,10 +140,9 @@ setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
# Load shell "functions" (actually aliases) # Load shell "functions" (actually aliases)
source $WM_PROJECT_DIR/etc/config.csh/functions source $WM_PROJECT_DIR/etc/config.csh/functions
# Override definitions via prefs, with 'other' first so the sys-admin # Overrides via <prefs.csh>
# can provide base values independent of WM_PROJECT_SITE _foamEtc -mode=o prefs.csh # 1) other (system) systems
_foamEtc -mode=o prefs.csh _foamEtc -mode=ug prefs.csh # 2) user or group settings
_foamEtc -mode=ug prefs.csh
# Evaluate command-line parameters and record settings for later. # Evaluate command-line parameters and record settings for later.
# These can be used to set/unset values, specify additional files etc. # These can be used to set/unset values, specify additional files etc.