Merge branch 'style-config' into 'develop'

Style config

See merge request Development/OpenFOAM-plus!184
This commit is contained in:
Mark Olesen
2017-12-14 12:02:13 +00:00
41 changed files with 347 additions and 785 deletions

View File

@ -4,37 +4,24 @@
# \\ / 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 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# Script # Script
# paraFoam # paraFoam
# #
# Description # Description
# Start paraview with the OpenFOAM libraries and reader modules. # Start paraview with OpenFOAM libraries and reader modules.
# #
# Note # Note
# Combining -block or -builtin options with -region option yields # Combining -block, -vtk, -builtin options with -region option yields
# undefined behaviour # undefined behaviour
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
usage() { printHelp() {
exec 1>&2 # Print usage to stdout so that it can be captured for bash completion
while [ "$#" -ge 1 ]; do echo "$1"; shift; done
cat<<USAGE cat<<USAGE
Usage: ${0##*/} [OPTION] [--] [PARAVIEW_OPTION] Usage: ${0##*/} [OPTION] [--] [PARAVIEW_OPTION]
@ -47,7 +34,7 @@ options:
create .blockMesh, .foam, .OpenFOAM files (for all regions) create .blockMesh, .foam, .OpenFOAM files (for all regions)
-touch-proc same as '-touch' but for each processor -touch-proc same as '-touch' but for each processor
-vtk | -builtin use VTK builtin OpenFOAM reader (uses .foam extension) -vtk | -builtin use VTK builtin OpenFOAM reader (uses .foam extension)
-help print the usage -help |-help-full print the usage
--help paraview help --help paraview help
Start paraview with the OpenFOAM libraries and reader modules. Start paraview with the OpenFOAM libraries and reader modules.
@ -56,7 +43,7 @@ Note that paraview options begin with double dashes.
paraview=$(command -v paraview) paraview=$(command -v paraview)
USAGE USAGE
exit 1 exit 0 # A clean exit
} }
# Report error and exit # Report error and exit
@ -91,8 +78,8 @@ unset regionName optTouch
while [ "$#" -gt 0 ] while [ "$#" -gt 0 ]
do do
case "$1" in case "$1" in
-h | -help*) -h | -help-*)
usage printHelp
;; ;;
-block*) -block*)
extension=blockMesh extension=blockMesh

View File

@ -6,43 +6,40 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/bashrc # etc/bashrc
# #
# Description # Description
# Set the environment for OpenFOAM when using a POSIX shell. # Set OpenFOAM environment for POSIX shell (eg, bash,dash,zsh,...)
# To be sourced manually or from the ~/.profile or ~/.bashrc files. # Source manually or from the ~/.profile or ~/.bashrc files.
# Should be usable by any POSIX-compliant shell (eg, bash,dash,zsh,...) #
# Note
# 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.
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
export WM_PROJECT=OpenFOAM export WM_PROJECT=OpenFOAM
export WM_PROJECT_VERSION=plus export WM_PROJECT_VERSION=plus
################################################################################ # [FOAM_INST_DIR] - parent directory containing the OpenFOAM installation.
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # * When this file is located as $WM_PROJECT_DIR/etc/bashrc, the next lines
# # should work when sourced by BASH or ZSH shells. If this however fails,
# FOAM_INST_DIR = the parent directory containing the OpenFOAM installation(s). # set one of the fallback values to an appropriate path.
# - If the OpenFOAM installation has this OpenFOAM-<VERSION>/etc/bashrc, the # --
# next lines should work when sourced by a BASH or ZSH shell.
# - If this does not produce the desired result, please set one of the fallback
# values to an appropriate path.
#
rc="${BASH_SOURCE:-${ZSH_NAME:+$0}}" rc="${BASH_SOURCE:-${ZSH_NAME:+$0}}"
[ -n "$rc" ] && FOAM_INST_DIR=$(\cd $(dirname $rc)/../.. && \pwd -L) || \ [ -n "$rc" ] && FOAM_INST_DIR=$(\cd $(dirname $rc)/../.. && \pwd -L) || \
FOAM_INST_DIR=$HOME/$WM_PROJECT FOAM_INST_DIR=$HOME/$WM_PROJECT
@ -55,55 +52,55 @@ FOAM_INST_DIR=$HOME/$WM_PROJECT
export FOAM_INST_DIR export FOAM_INST_DIR
unset rc unset rc
# The default environment variables below can be overridden in a prefs.sh file # Default environment variables.
# located in ~/.OpenFOAM/$WM_PROJECT_VERSION, ~/.OpenFOAM, # Can override with a <prefs.sh> file instead of editing below.
# $FOAM_INST_DIR/site/$WM_PROJECT_VERSION or $FOAM_INST_DIR/site
#- Compiler location: # [WM_COMPILER_TYPE] - Compiler location:
# WM_COMPILER_TYPE = system | ThirdParty # = system | ThirdParty
export WM_COMPILER_TYPE=system export WM_COMPILER_TYPE=system
#- Compiler: # [WM_COMPILER] - Compiler:
# WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL # = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-3] | Gcc7[1-2] | GccKNL |
# | Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray # Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
export WM_COMPILER=Gcc export WM_COMPILER=Gcc
unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
#- Memory addressing: # [WM_ARCH_OPTION] - Memory addressing:
# WM_ARCH_OPTION = 32 | 64 # = 32 | 64
# - on a 64-bit OS this can be 32 or 64 # * on a 64-bit OS this can be 32 or 64
# - on a 32-bit OS addressing is 32-bit and this option is not used # * on a 32-bit OS, it is always 32-bit and this option is ignored
export WM_ARCH_OPTION=64 export WM_ARCH_OPTION=64
#- Precision: # [WM_PRECISION_OPTION] - Floating-point precision:
# WM_PRECISION_OPTION = DP | SP # = DP | SP
export WM_PRECISION_OPTION=DP export WM_PRECISION_OPTION=DP
#- Label size: # [WM_LABEL_SIZE] - Label size in bits:
# WM_LABEL_SIZE = 32 | 64 # = 32 | 64
export WM_LABEL_SIZE=32 export WM_LABEL_SIZE=32
#- Optimised, debug, profiling: # [WM_COMPILE_OPTION] - Optimised, debug, profiling:
# WM_COMPILE_OPTION = Opt | Debug | Prof # = Opt | Debug | Prof
export WM_COMPILE_OPTION=Opt export WM_COMPILE_OPTION=Opt
#- MPI implementation: # [WM_MPLIB] - MPI implementation:
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI # = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPI | MPICH | MPICH-GM |
# | MPI | CRAY-MPICH | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI # HPMPI | CRAY-MPICH | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI
export WM_MPLIB=SYSTEMOPENMPI export WM_MPLIB=SYSTEMOPENMPI
#- Operating System:
# WM_OSTYPE = POSIX
#export WM_OSTYPE=POSIX
#- Alternative to 'trapFpe' controlDict entry # [FOAM_SIGFPE] - Trapping of floating-point exceptions.
# for floating-point exceptions (true|false) # - overrides the 'trapFpe' controlDict entry
# = true | false
#export FOAM_SIGFPE=true #export FOAM_SIGFPE=true
#- Alternative to 'setNaN' controlDict entry # [FOAM_SETNAN] - Memory initialisation as NaN
# for memory initialisation (true|false) # - overrides the 'setNaN' controlDict entry
# = true | false
#export FOAM_SETNAN=false #export FOAM_SETNAN=false
# [WM_OSTYPE] - Operating System Type:
# = POSIX
#export WM_OSTYPE=POSIX
################################################################################ ################################################################################
@ -153,14 +150,14 @@ _foamEval $@
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
foamClean=$WM_PROJECT_DIR/bin/foamCleanPath foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
#- Clean PATH # Clean PATH
cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned" cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned"
#- Clean LD_LIBRARY_PATH # Clean LD_LIBRARY_PATH
cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") \ cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") \
&& LD_LIBRARY_PATH="$cleaned" && LD_LIBRARY_PATH="$cleaned"
#- Clean MANPATH # Clean MANPATH
cleaned=$($foamClean "$MANPATH" "$foamOldDirs") && MANPATH="$cleaned" cleaned=$($foamClean "$MANPATH" "$foamOldDirs") && MANPATH="$cleaned"
export PATH LD_LIBRARY_PATH MANPATH export PATH LD_LIBRARY_PATH MANPATH
@ -198,18 +195,18 @@ _foamEtc config.sh/FFTW
# Clean environment paths again. Only remove duplicates # Clean environment paths again. Only remove duplicates
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#- Clean PATH # Clean PATH
cleaned=$($foamClean "$PATH") && PATH="$cleaned" cleaned=$($foamClean "$PATH") && PATH="$cleaned"
#- Clean LD_LIBRARY_PATH # Clean LD_LIBRARY_PATH
cleaned=$($foamClean "$LD_LIBRARY_PATH") && LD_LIBRARY_PATH="$cleaned" cleaned=$($foamClean "$LD_LIBRARY_PATH") && LD_LIBRARY_PATH="$cleaned"
#- Clean MANPATH (trailing ':' to find system pages) # Clean MANPATH (trailing ':' to find system pages)
cleaned=$($foamClean "$MANPATH") && MANPATH="${cleaned}:" cleaned=$($foamClean "$MANPATH") && MANPATH="${cleaned}:"
export PATH LD_LIBRARY_PATH MANPATH export PATH LD_LIBRARY_PATH MANPATH
#- Clean LD_PRELOAD # Clean LD_PRELOAD
if [ -n "$LD_PRELOAD" ] if [ -n "$LD_PRELOAD" ]
then then
cleaned=$($foamClean "$LD_PRELOAD") && LD_PRELOAD="$cleaned" cleaned=$($foamClean "$LD_PRELOAD") && LD_PRELOAD="$cleaned"
@ -220,10 +217,10 @@ fi
# Cleanup environment # Cleanup environment
# ~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~
#- Functions # Functions
. $WM_PROJECT_DIR/etc/config.sh/functions . $WM_PROJECT_DIR/etc/config.sh/functions
#- Variables (do as last for a clean exit code) # Variables (do as last for a clean exit code)
unset cleaned foamClean foamOldDirs unset cleaned foamClean foamOldDirs
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/CGAL # etc/config.csh/CGAL

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/FFTW # etc/config.csh/FFTW

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/aliases # etc/config.csh/aliases
@ -53,12 +41,6 @@ alias wmSchedOff 'unsetenv WM_SCHEDULER'
# ~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~
alias foam 'cd $WM_PROJECT_DIR' alias foam 'cd $WM_PROJECT_DIR'
if ( $?WM_PROJECT_SITE ) then
alias foamSite 'cd $WM_PROJECT_SITE'
else
alias foamSite 'cd $WM_PROJECT_INST_DIR/site'
endif
alias src 'cd $FOAM_SRC' alias src 'cd $FOAM_SRC'
alias lib 'cd $FOAM_LIBBIN' alias lib 'cd $FOAM_LIBBIN'
alias app 'cd $FOAM_APP' alias app 'cd $FOAM_APP'

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/compiler # etc/config.csh/compiler
@ -32,7 +20,7 @@
switch ("$WM_COMPILER_TYPE") switch ("$WM_COMPILER_TYPE")
case ThirdParty: case ThirdParty:
# Default versions of GMP, MPFR and MPC, override as necessary # Default versions of GMP, MPFR, MPC - override as necessary
set gmp_version=gmp-system set gmp_version=gmp-system
set mpfr_version=mpfr-system set mpfr_version=mpfr-system
set mpc_version=mpc-system set mpc_version=mpc-system
@ -57,6 +45,9 @@ case ThirdParty:
case Gcc54: case Gcc54:
set gcc_version=gcc-5.4.0 set gcc_version=gcc-5.4.0
breaksw breaksw
case Gcc55:
set gcc_version=gcc-5.5.0
breaksw
case Gcc61: case Gcc61:
set gcc_version=gcc-6.1.0 set gcc_version=gcc-6.1.0
breaksw breaksw

View File

@ -6,8 +6,9 @@
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# This file is part of OpenFOAM, licensed under the GNU General Public License # License
# <http://www.gnu.org/licenses/>. # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/complete-wrapper # etc/config.csh/complete-wrapper

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.csh/ensight # config.csh/ensight

View File

@ -3,23 +3,11 @@
# \\ / 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 | # \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.csh/example/compiler # config.csh/example/compiler
@ -30,6 +18,9 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Load the standard versions
eval `$WM_PROJECT_DIR/bin/foamEtcFile -csh -mode=o config.csh/compiler`
# Modify/override compiler settings # Modify/override compiler settings
switch ("$WM_COMPILER") switch ("$WM_COMPILER")
case Gcc70: case Gcc70:

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.csh/example/openmpi # config.csh/example/openmpi
@ -31,6 +19,6 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Modified openmpi settings # Modified openmpi settings
setenv FOAM_MPI openmpi-1.4.3 setenv FOAM_MPI openmpi-3.0.0
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.csh/example/paraview # config.csh/example/paraview
@ -34,12 +22,10 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# # Use shipped paraview config file (-mode=o) with a different ParaView_VERSION
# Use other (shipped) paraview with a different ParaView_VERSION
#
set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.csh/paraview` set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.csh/paraview`
if ( $status == 0 ) source $foamFile ParaView_VERSION=5.0.1 if ( $status == 0 ) source $foamFile ParaView_VERSION=5.4.0
unset foamFile unset foamFile

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.csh/example/prefs.csh # config.csh/example/prefs.csh
@ -36,17 +24,13 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
## Specify OpenFOAM ThirdParty compiler #- Compiler location:
## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ setenv WM_COMPILER_TYPE ThirdParty
# set WM_COMPILER_TYPE=ThirdParty
## Specify compiler type #- Compiler:
## ~~~~~~~~~~~~~~~~~~~~~ setenv WM_COMPILER Clang
#setenv WM_COMPILER Clang
## Specify system openmpi
## ~~~~~~~~~~~~~~~~~~~~~~
# setenv WM_MPLIB SYSTEMOPENMPI
#- MPI implementation:
setenv WM_MPLIB SYSTEMOPENMPI
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/mpi # etc/config.csh/mpi

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.csh/paraview # config.csh/paraview

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/settings # etc/config.csh/settings
@ -38,11 +26,19 @@ alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}'
alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}' alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}'
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Set environment variables according to system type setenv WM_ARCH `uname -s` # System name
if (! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX # Default is POSIX if (! $?WM_OSTYPE ) setenv WM_OSTYPE POSIX # System type (POSIX is default)
setenv WM_COMPILER_LIB_ARCH # Set, but empty: default for 32bit
setenv WM_ARCH `uname -s` # Default compiler = gcc/g++ and C++11
setenv WM_CC "gcc"
setenv WM_CXX "g++"
setenv WM_CFLAGS "-fPIC"
setenv WM_CXXFLAGS "-fPIC -std=c++11"
setenv WM_COMPILER_ARCH # Defined but empty
setenv WM_COMPILER_LIB_ARCH # Defined but empty: default for 32bit
unsetenv WM_LDFLAGS
# Adjust according to system and architecture
switch ($WM_ARCH) switch ($WM_ARCH)
case Linux: case Linux:
setenv WM_ARCH linux setenv WM_ARCH linux
@ -57,21 +53,17 @@ case Linux:
switch ($WM_ARCH_OPTION) switch ($WM_ARCH_OPTION)
case 32: case 32:
setenv WM_COMPILER_ARCH 64 setenv WM_COMPILER_ARCH 64
setenv WM_CC 'gcc' setenv WM_CFLAGS "$WM_CFLAGS -m32"
setenv WM_CXX 'g++' setenv WM_CXXFLAGS "$WM_CXXFLAGS -m32"
setenv WM_CFLAGS '-m32 -fPIC' setenv WM_LDFLAGS "-m32"
setenv WM_CXXFLAGS '-m32 -fPIC -std=c++11'
setenv WM_LDFLAGS '-m32'
breaksw breaksw
case 64: case 64:
setenv WM_ARCH linux64 setenv WM_ARCH linux64
setenv WM_COMPILER_LIB_ARCH 64 setenv WM_COMPILER_LIB_ARCH 64
setenv WM_CC 'gcc' setenv WM_CFLAGS "$WM_CFLAGS -m64"
setenv WM_CXX 'g++' setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64"
setenv WM_CFLAGS '-m64 -fPIC' setenv WM_LDFLAGS "-m64"
setenv WM_CXXFLAGS '-m64 -fPIC -std=c++11'
setenv WM_LDFLAGS '-m64'
breaksw breaksw
default: default:
@ -83,27 +75,34 @@ case Linux:
case ia64: case ia64:
setenv WM_ARCH linuxIA64 setenv WM_ARCH linuxIA64
setenv WM_COMPILER I64 breaksw
case armv7l:
setenv WM_ARCH linuxARM7
setenv WM_ARCH_OPTION 32
setenv WM_COMPILER_LIB_ARCH 32
breaksw
case aarch64:
setenv WM_ARCH linuxARM64
setenv WM_ARCH_OPTION 64
setenv WM_COMPILER_LIB_ARCH 64
breaksw breaksw
case ppc64: case ppc64:
setenv WM_ARCH linuxPPC64 setenv WM_ARCH linuxPPC64
setenv WM_COMPILER_LIB_ARCH 64 setenv WM_COMPILER_LIB_ARCH 64
setenv WM_CC 'gcc' setenv WM_CFLAGS "$WM_CFLAGS -m64"
setenv WM_CXX 'g++' setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64"
setenv WM_CFLAGS '-m64 -fPIC' setenv WM_LDFLAGS "-m64"
setenv WM_CXXFLAGS '-m64 -fPIC -std=c++11'
setenv WM_LDFLAGS '-m64'
breaksw breaksw
case ppc64le: case ppc64le:
setenv WM_ARCH linuxPPC64le setenv WM_ARCH linuxPPC64le
setenv WM_COMPILER_LIB_ARCH 64 setenv WM_COMPILER_LIB_ARCH 64
setenv WM_CC 'gcc' setenv WM_CFLAGS "$WM_CFLAGS -m64"
setenv WM_CXX 'g++' setenv WM_CXXFLAGS "$WM_CXXFLAGS -m64"
setenv WM_CFLAGS '-m64 -fPIC' setenv WM_LDFLAGS "-m64"
setenv WM_CXXFLAGS '-m64 -fPIC -std=c++11'
setenv WM_LDFLAGS '-m64'
breaksw breaksw
default: default:
@ -117,11 +116,9 @@ case SunOS:
setenv WM_ARCH SunOS64 setenv WM_ARCH SunOS64
setenv WM_MPLIB FJMPI setenv WM_MPLIB FJMPI
setenv WM_COMPILER_LIB_ARCH 64 setenv WM_COMPILER_LIB_ARCH 64
setenv WM_CC 'gcc' setenv WM_CFLAGS "$WM_CFLAGS -mabi=64"
setenv WM_CXX 'g++' setenv WM_CXXFLAGS "$WM_CXXFLAGS -mabi=64"
setenv WM_CFLAGS '-mabi=64 -fPIC' setenv WM_LDFLAGS "-mabi=64 -G0"
setenv WM_CXXFLAGS '-mabi=64 -fPIC -std=c++11'
setenv WM_LDFLAGS '-mabi=64 -G0'
breaksw breaksw
default: default:
@ -137,8 +134,8 @@ endsw
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Optional jobControl directory: unset is equivalent to ~/.OpenFOAM/jobControl # [FOAM_JOB_DIR] - unset is equivalent to ~/.OpenFOAM/jobControl
# setenv FOAM_JOB_DIR "$HOME/.OpenFOAM/jobControl" ## setenv FOAM_JOB_DIR "$HOME/.OpenFOAM/jobControl"
# wmake configuration # wmake configuration
setenv WM_DIR $WM_PROJECT_DIR/wmake setenv WM_DIR $WM_PROJECT_DIR/wmake
@ -213,18 +210,15 @@ if (! $?WM_COMPILER_TYPE ) setenv WM_COMPILER_TYPE system
# Adjustments for non-gcc compilers # Adjustments for non-gcc compilers
switch ("$WM_COMPILER") switch ("$WM_COMPILER")
case Clang*: case Clang*: # Clang compiler suite
# Using clang compiler suite
setenv WM_CC 'clang' setenv WM_CC 'clang'
setenv WM_CXX 'clang++' setenv WM_CXX 'clang++'
breaksw breaksw
case Cray*: case Cray*: # Cray system compilers
# Using cray system compilers
setenv WM_CC 'cc' setenv WM_CC 'cc'
setenv WM_CXX 'CC' setenv WM_CXX 'CC'
breaksw breaksw
case Icc*: case Icc*: # Intel compilers
# Using intel compilers
setenv WM_CC 'icc' setenv WM_CC 'icc'
setenv WM_CXX 'icpc' setenv WM_CXX 'icpc'
breaksw breaksw
@ -238,15 +232,18 @@ unsetenv GMP_ARCH_PATH MPFR_ARCH_PATH
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamEtc config.csh/compiler _foamEtc config.csh/compiler
# ThirdParty base for compilers
set archDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH
switch ("$WM_COMPILER_TYPE-$WM_COMPILER") switch ("$WM_COMPILER_TYPE-$WM_COMPILER")
case ThirdParty-Gcc*: case ThirdParty-Gcc*:
if (! $?gmp_version ) set gmp_version=gmp-system if (! $?gmp_version ) set gmp_version=gmp-system
if (! $?mpfr_version ) set mpfr_version=mpfr-system if (! $?mpfr_version ) set mpfr_version=mpfr-system
if (! $?mpc_version ) set mpc_version=mpc-system if (! $?mpc_version ) set mpc_version=mpc-system
set gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version set gccDir=$archDir/$gcc_version
set gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gmp_version set gmpDir=$archDir/$gmp_version
set mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpfr_version set mpfrDir=$archDir/$mpfr_version
set mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$mpc_version set mpcDir=$archDir/$mpc_version
# Check that the compiler directory can be found # Check that the compiler directory can be found
if ( ! -d "$gccDir" ) then if ( ! -d "$gccDir" ) then
@ -288,7 +285,7 @@ GCC_NOT_FOUND
breaksw breaksw
case ThirdParty-Clang*: case ThirdParty-Clang*:
set clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version set clangDir=$archDir/$clang_version
# Check that the compiler directory can be found # Check that the compiler directory can be found
if ( ! -d "$clangDir" ) then if ( ! -d "$clangDir" ) then
@ -332,10 +329,10 @@ endsw
# Cleanup # Cleanup
# ~~~~~~~ # ~~~~~~~
unset archDir
unset gcc_version gccDir unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
unset clang_version clangDir unset clang_version clangDir
# Retain: _foamAddPath _foamAddLib _foamAddMan # Retain: _foamAddPath _foamAddLib _foamAddMan
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -5,8 +5,9 @@
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# This file is part of OpenFOAM, licensed under the GNU General Public License # License
# <http://www.gnu.org/licenses/>. # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/tcsh_completion # etc/config.csh/tcsh_completion

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/unset # etc/config.csh/unset
@ -182,7 +170,6 @@ unalias wmSchedOn
unalias wmSchedOff unalias wmSchedOff
unalias foam unalias foam
unalias foamSite
unalias src unalias src
unalias lib unalias lib

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.csh/vtk # etc/config.csh/vtk

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/CGAL # etc/config.sh/CGAL

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/FFTW # etc/config.sh/FFTW

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/aliases # etc/config.sh/aliases
@ -51,13 +39,6 @@ alias wmSchedOff='unset WM_SCHEDULER'
# ~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~
alias foam='cd $WM_PROJECT_DIR' alias foam='cd $WM_PROJECT_DIR'
if [ -n "$WM_PROJECT_SITE" ]
then
alias foamSite='cd $WM_PROJECT_SITE'
else
alias foamSite='cd $WM_PROJECT_INST_DIR/site'
fi
alias src='cd $FOAM_SRC' alias src='cd $FOAM_SRC'
alias lib='cd $FOAM_LIBBIN' alias lib='cd $FOAM_LIBBIN'
alias app='cd $FOAM_APP' alias app='cd $FOAM_APP'

View File

@ -5,8 +5,9 @@
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# This file is part of OpenFOAM, licensed under the GNU General Public License # License
# <http://www.gnu.org/licenses/>. # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/bash_completion # etc/config.sh/bash_completion

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/ccmio # etc/config.sh/ccmio

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/compiler # etc/config.sh/compiler
@ -32,7 +20,7 @@
case "$WM_COMPILER_TYPE" in case "$WM_COMPILER_TYPE" in
ThirdParty) ThirdParty)
# Default versions of GMP, MPFR and MPC, override as necessary # Default versions of GMP, MPFR, MPC - override as necessary
gmp_version=gmp-system gmp_version=gmp-system
mpfr_version=mpfr-system mpfr_version=mpfr-system
mpc_version=mpc-system mpc_version=mpc-system
@ -56,6 +44,9 @@ ThirdParty)
Gcc54) Gcc54)
gcc_version=gcc-5.4.0 gcc_version=gcc-5.4.0
;; ;;
Gcc55)
gcc_version=gcc-5.5.0
;;
Gcc61) Gcc61)
gcc_version=gcc-6.1.0 gcc_version=gcc-6.1.0
;; ;;

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/ensight # etc/config.sh/ensight

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.sh/example/compiler # config.sh/example/compiler
@ -30,7 +18,7 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Load the standard versions... # Load the standard versions
eval $($WM_PROJECT_DIR/bin/foamEtcFile -sh -mode=o config.sh/compiler) eval $($WM_PROJECT_DIR/bin/foamEtcFile -sh -mode=o config.sh/compiler)
# Modify/override compiler settings # Modify/override compiler settings

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.sh/example/openmpi # config.sh/example/openmpi
@ -31,6 +19,6 @@
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Modified openmpi settings # Modified openmpi settings
export FOAM_MPI=openmpi-1.4.3 export FOAM_MPI=openmpi-3.0.0
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.sh/example/paraview # config.sh/example/paraview
@ -34,13 +22,10 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# # Use shipped paraview config file (-mode=o) with a different ParaView_VERSION
# Use the shipped paraview config file (-mode=o)
# with a different ParaView_VERSION
#
foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.sh/paraview 2>/dev/null) foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.sh/paraview 2>/dev/null)
[ $? -eq 0 ] && . $foamFile ParaView_VERSION=5.0.1 [ $? -eq 0 ] && . $foamFile ParaView_VERSION=5.4.0
unset foamFile unset foamFile

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# config.sh/example/prefs.sh # config.sh/example/prefs.sh
@ -36,17 +24,13 @@
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
## Specify OpenFOAM ThirdParty compiler #- Compiler location:
## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ WM_COMPILER_TYPE=ThirdParty
#WM_COMPILER_TYPE=ThirdParty
## Specify compiler type #- Compiler:
## ~~~~~~~~~~~~~~~~~~~~~ export WM_COMPILER=Clang
#export WM_COMPILER=Clang
## Specify system openmpi
## ~~~~~~~~~~~~~~~~~~~~~~
#export WM_MPLIB=SYSTEMOPENMPI
#- MPI implementation:
export WM_MPLIB=SYSTEMOPENMPI
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/functions # etc/config.sh/functions

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/gperftools # etc/config.sh/gperftools

View File

@ -5,8 +5,9 @@
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd. # \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# This file is part of OpenFOAM, licensed under the GNU General Public License # License
# <http://www.gnu.org/licenses/>. # This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/kahip # etc/config.sh/kahip

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/metis # etc/config.sh/metis

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/mgridgen # etc/config.sh/mgridgen

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/mpi # etc/config.sh/mpi

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/paraview # etc/config.sh/paraview

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/scotch # etc/config.sh/scotch

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/settings # etc/config.sh/settings
@ -29,23 +17,24 @@
# Sourced from OpenFOAM-<VERSION>/etc/bashrc # Sourced from OpenFOAM-<VERSION>/etc/bashrc
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Set environment variables according to system type export WM_ARCH=$(uname -s) # System name
: ${WM_OSTYPE:=POSIX}; export WM_OSTYPE # Default is POSIX : ${WM_OSTYPE:=POSIX}; export WM_OSTYPE # System type (POSIX is default)
export WM_ARCH=$(uname -s) # Default compiler = gcc/g++ and C++11
export WM_CC="gcc"
export WM_CXX="g++"
export WM_CFLAGS="-fPIC"
export WM_CXXFLAGS="-fPIC -std=c++11"
unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH WM_LDFLAGS
# Adjust according to system and architecture
case "$WM_ARCH" in case "$WM_ARCH" in
Linux) Linux)
WM_ARCH=linux WM_ARCH=linux
# Compiler specifics
case $(uname -m) in case $(uname -m) in
i686) i686)
export WM_ARCH_OPTION=32 export WM_ARCH_OPTION=32
export WM_CC='gcc'
export WM_CXX='g++'
export WM_CFLAGS='-fPIC'
export WM_CXXFLAGS='-fPIC -std=c++11'
export WM_LDFLAGS=
;; ;;
x86_64) x86_64)
@ -53,20 +42,16 @@ Linux)
case "$WM_ARCH_OPTION" in case "$WM_ARCH_OPTION" in
32) 32)
export WM_COMPILER_ARCH=64 export WM_COMPILER_ARCH=64
export WM_CC='gcc' export WM_CFLAGS="$WM_CFLAGS -m32"
export WM_CXX='g++' export WM_CXXFLAGS="$WM_CXXFLAGS -m32"
export WM_CFLAGS='-m32 -fPIC' export WM_LDFLAGS="-m32"
export WM_CXXFLAGS='-m32 -fPIC -std=c++11'
export WM_LDFLAGS='-m32'
;; ;;
64) 64)
WM_ARCH=linux64 WM_ARCH=linux64
export WM_COMPILER_LIB_ARCH=64 export WM_COMPILER_LIB_ARCH=64
export WM_CC='gcc' export WM_CFLAGS="$WM_CFLAGS -m64"
export WM_CXX='g++' export WM_CXXFLAGS="$WM_CXXFLAGS -m64"
export WM_CFLAGS='-m64 -fPIC' export WM_LDFLAGS="-m64"
export WM_CXXFLAGS='-m64 -fPIC -std=c++11'
export WM_LDFLAGS='-m64'
;; ;;
*) *)
echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32|64" 1>&2 echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32|64" 1>&2
@ -76,38 +61,34 @@ Linux)
ia64) ia64)
WM_ARCH=linuxIA64 WM_ARCH=linuxIA64
export WM_COMPILER=I64
;; ;;
armv7l) armv7l)
WM_ARCH=linuxARM7 WM_ARCH=linuxARM7
export WM_ARCH_OPTION=32 export WM_ARCH_OPTION=32
export WM_COMPILER_LIB_ARCH=32 export WM_COMPILER_LIB_ARCH=32
export WM_CC='gcc' ;;
export WM_CXX='g++'
export WM_CFLAGS='-fPIC' aarch64)
export WM_CXXFLAGS='-fPIC -std=c++11' WM_ARCH=linuxARM64
export WM_LDFLAGS= export WM_ARCH_OPTION=64
export WM_COMPILER_LIB_ARCH=64
;; ;;
ppc64) ppc64)
WM_ARCH=linuxPPC64 WM_ARCH=linuxPPC64
export WM_COMPILER_LIB_ARCH=64 export WM_COMPILER_LIB_ARCH=64
export WM_CC='gcc' export WM_CFLAGS="$WM_CFLAGS -m64"
export WM_CXX='g++' export WM_CXXFLAGS="$WM_CXXFLAGS -m64"
export WM_CFLAGS='-m64 -fPIC' export WM_LDFLAGS="-m64"
export WM_CXXFLAGS='-m64 -fPIC -std=c++11'
export WM_LDFLAGS='-m64'
;; ;;
ppc64le) ppc64le)
WM_ARCH=linuxPPC64le WM_ARCH=linuxPPC64le
export WM_COMPILER_LIB_ARCH=64 export WM_COMPILER_LIB_ARCH=64
export WM_CC='gcc' export WM_CFLAGS="$WM_CFLAGS -m64"
export WM_CXX='g++' export WM_CXXFLAGS="$WM_CXXFLAGS -m64"
export WM_CFLAGS='-m64 -fPIC' export WM_LDFLAGS="-m64"
export WM_CXXFLAGS='-m64 -fPIC -std=c++11'
export WM_LDFLAGS='-m64'
;; ;;
*) *)
@ -120,11 +101,9 @@ SunOS)
WM_ARCH=SunOS64 WM_ARCH=SunOS64
WM_MPLIB=FJMPI WM_MPLIB=FJMPI
export WM_COMPILER_LIB_ARCH=64 export WM_COMPILER_LIB_ARCH=64
export WM_CC='gcc' export WM_CFLAGS="$WM_CFLAGS -mabi=64"
export WM_CXX='g++' export WM_CXXFLAGS="$WM_CXXFLAGS -mabi=64"
export WM_CFLAGS='-mabi=64 -fPIC' export WM_LDFLAGS="-mabi=64 -G0"
export WM_CXXFLAGS='-mabi=64 -fPIC -std=c++11'
export WM_LDFLAGS='-mabi=64 -G0'
;; ;;
*) # An unsupported operating system *) # An unsupported operating system
@ -137,11 +116,10 @@ UNSUPPORTED_OS
;; ;;
esac esac
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Optional jobControl directory: unset is equivalent to ~/.OpenFOAM/jobControl # [FOAM_JOB_DIR] - unset is equivalent to ~/.OpenFOAM/jobControl
# export FOAM_JOB_DIR="$HOME/.OpenFOAM/jobControl" ## export FOAM_JOB_DIR="$HOME/.OpenFOAM/jobControl"
# wmake configuration # wmake configuration
export WM_DIR=$WM_PROJECT_DIR/wmake export WM_DIR=$WM_PROJECT_DIR/wmake
@ -157,7 +135,12 @@ export FOAM_LIBBIN=$WM_PROJECT_DIR/platforms/$WM_OPTIONS/lib
export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib export FOAM_EXT_LIBBIN=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/lib
# Site-specific directory # Site-specific directory
siteDir="${WM_PROJECT_SITE:-$WM_PROJECT_INST_DIR/site}" if [ -n "$WM_PROJECT_SITE" ]
then
siteDir=$WM_PROJECT_SITE
else
siteDir=$WM_PROJECT_INST_DIR/site
fi
# Shared site executables/libraries # Shared site executables/libraries
# Similar naming convention as ~OpenFOAM expansion # Similar naming convention as ~OpenFOAM expansion
@ -215,18 +198,15 @@ _foamAddLib $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN
# Adjust for non-gcc compilers # Adjust for non-gcc compilers
case "$WM_COMPILER" in case "$WM_COMPILER" in
Clang*) Clang*) # Clang compiler suite
# Using clang compiler suite
export WM_CC='clang' export WM_CC='clang'
export WM_CXX='clang++' export WM_CXX='clang++'
;; ;;
Cray*) Cray*) # Cray system compilers
# Using cray system compilers
export WM_CC='cc' export WM_CC='cc'
export WM_CXX='CC' export WM_CXX='CC'
;; ;;
Icc*) Icc*) # Intel compilers
# Using intel compilers
export WM_CC='icc' export WM_CC='icc'
export WM_CXX='icpc' export WM_CXX='icpc'
;; ;;
@ -240,12 +220,15 @@ unset GMP_ARCH_PATH MPFR_ARCH_PATH
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamEtc config.sh/compiler _foamEtc config.sh/compiler
# ThirdParty base for compilers
archDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH
case "$WM_COMPILER_TYPE-$WM_COMPILER" in case "$WM_COMPILER_TYPE-$WM_COMPILER" in
ThirdParty-Gcc*) ThirdParty-Gcc*)
gccDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$gcc_version gccDir=$archDir/$gcc_version
gmpDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/${gmp_version:-gmp-system} gmpDir=$archDir/${gmp_version:-gmp-system}
mpfrDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/${mpfr_version:-mpfr-system} mpfrDir=$archDir/${mpfr_version:-mpfr-system}
mpcDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/${mpc_version:-mpc-system} mpcDir=$archDir/${mpc_version:-mpc-system}
# Check that the compiler directory can be found # Check that the compiler directory can be found
[ -d "$gccDir" ] || /bin/cat << GCC_NOT_FOUND 1>&2 [ -d "$gccDir" ] || /bin/cat << GCC_NOT_FOUND 1>&2
@ -289,7 +272,7 @@ GCC_NOT_FOUND
;; ;;
ThirdParty-Clang*) ThirdParty-Clang*)
clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version clangDir=$archDir/$clang_version
# Check that the compiler directory can be found # Check that the compiler directory can be found
[ -d "$clangDir" ] || /bin/cat << CLANG_NOT_FOUND 1>&2 [ -d "$clangDir" ] || /bin/cat << CLANG_NOT_FOUND 1>&2
@ -329,9 +312,9 @@ UNKNOWN_TYPE
esac esac
# Cleanup # Cleanup
# ~~~~~~~ # ~~~~~~~
unset archDir
unset gcc_version gccDir unset gcc_version gccDir
unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir
unset clang_version clangDir unset clang_version clangDir

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/unset # etc/config.sh/unset
@ -168,7 +156,6 @@ unalias wmSchedOn 2>/dev/null
unalias wmSchedOff 2>/dev/null unalias wmSchedOff 2>/dev/null
unalias foam 2>/dev/null unalias foam 2>/dev/null
unalias foamSite 2>/dev/null
unalias src 2>/dev/null unalias src 2>/dev/null
unalias lib 2>/dev/null unalias lib 2>/dev/null

View File

@ -6,20 +6,8 @@
# \\/ M anipulation | # \\/ M anipulation |
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/config.sh/vtk # etc/config.sh/vtk

123
etc/cshrc
View File

@ -6,42 +6,40 @@
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd. # \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# License # License
# This file is part of OpenFOAM. # This file is part of OpenFOAM, licensed under GNU General Public License
# # <http://www.gnu.org/licenses/>.
# OpenFOAM is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/cshrc # etc/cshrc
# #
# Description # Description
# Set the environment for OpenFOAM when using a cshell. # Set OpenFOAM environment for C-shell (csh, tcsh).
# To be sourced manually or from the ~/.login or ~/.cshrc files. # Source manually or from the ~/.login or ~/.cshrc files.
#
# Note
# 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.
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
setenv WM_PROJECT OpenFOAM setenv WM_PROJECT OpenFOAM
setenv WM_PROJECT_VERSION plus setenv WM_PROJECT_VERSION plus
################################################################################ # [FOAM_INST_DIR] - parent directory containing the OpenFOAM installation.
# USER EDITABLE PART: Changes made here may be lost with the next upgrade # * When this file is located as $WM_PROJECT_DIR/etc/cshrc, the next lines
# # should work when sourced by CSH or TCSH shells. If this however fails,
# FOAM_INST_DIR = the parent directory containing the OpenFOAM installation(s). # set one of the fallback values to an appropriate path.
# - If the OpenFOAM installation has this OpenFOAM-<VERSION>/etc/cshrc, the # --
# next lines should work when sourced by a CSH or TCSH shell.
# - If this does not produce the desired result, please set one of the fallback
# values to an appropriate path.
#
setenv FOAM_INST_DIR `lsof +p $$ |& \ setenv FOAM_INST_DIR `lsof +p $$ |& \
sed -n -e 's@[^/]*@@' -e 's@/'$WM_PROJECT'[^/]*/etc/cshrc.*@@p'` sed -n -e 's@[^/]*@@' -e 's@/'$WM_PROJECT'[^/]*/etc/cshrc.*@@p'`
# setenv FOAM_INST_DIR $HOME/$WM_PROJECT # setenv FOAM_INST_DIR $HOME/$WM_PROJECT
@ -51,56 +49,55 @@ setenv FOAM_INST_DIR `lsof +p $$ |& \
# END OF (NORMAL) USER EDITABLE PART # END OF (NORMAL) USER EDITABLE PART
################################################################################ ################################################################################
# The default environment variables below can be overridden in a prefs.csh file # Default environment variables.
# located in ~/.OpenFOAM/$WM_PROJECT_VERSION, ~/.OpenFOAM, # Can override with a <prefs.sh> file instead of editing below.
# $FOAM_INST_DIR/site/$WM_PROJECT_VERSION or $FOAM_INST_DIR/site
#- Compiler location: # [WM_COMPILER_TYPE] - Compiler location:
# WM_COMPILER_TYPE = system | ThirdParty # = system | ThirdParty
setenv WM_COMPILER_TYPE system setenv WM_COMPILER_TYPE system
#- Compiler: # [WM_COMPILER] - Compiler:
# WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL # = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-3] | Gcc7[1-2] | GccKNL |
# | Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray # Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
setenv WM_COMPILER Gcc setenv WM_COMPILER Gcc
setenv WM_COMPILER_ARCH # defined but empty
unsetenv WM_COMPILER_LIB_ARCH
#- Memory addressing: # [WM_ARCH_OPTION] - Memory addressing:
# WM_ARCH_OPTION = 32 | 64 # = 32 | 64
# - on a 64-bit OS this can be 32 or 64 # * on a 64-bit OS this can be 32 or 64
# - on a 32-bit OS addressing is 32-bit and this option is not used # * on a 32-bit OS, it is always 32-bit and this option is ignored
setenv WM_ARCH_OPTION 64 setenv WM_ARCH_OPTION 64
#- Precision: # [WM_PRECISION_OPTION] - Floating-point precision:
# WM_PRECISION_OPTION = DP | SP # = DP | SP
setenv WM_PRECISION_OPTION DP setenv WM_PRECISION_OPTION DP
#- Label size: # [WM_LABEL_SIZE] - Label size in bits:
# WM_LABEL_SIZE = 32 | 64 # = 32 | 64
setenv WM_LABEL_SIZE 32 setenv WM_LABEL_SIZE 32
#- Optimised, debug, profiling: # [WM_COMPILE_OPTION] - Optimised, debug, profiling:
# WM_COMPILE_OPTION = Opt | Debug | Prof # = Opt | Debug | Prof
setenv WM_COMPILE_OPTION Opt setenv WM_COMPILE_OPTION Opt
#- MPI implementation: # [WM_MPLIB] - MPI implementation:
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI # = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPI | MPICH | MPICH-GM |
# | MPI | CRAY-MPICH | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI # HPMPI | CRAY-MPICH | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI
setenv WM_MPLIB SYSTEMOPENMPI setenv WM_MPLIB SYSTEMOPENMPI
#- Operating System:
# WM_OSTYPE = POSIX
#setenv WM_OSTYPE POSIX
#- Alternative to 'trapFpe' controlDict entry # [FOAM_SIGFPE] - Trapping of floating-point exceptions.
# for floating-point exceptions (true|false) # - overrides the 'trapFpe' controlDict entry
# = true | false
#setenv FOAM_SIGFPE true #setenv FOAM_SIGFPE true
#- Alternative to 'setNaN' controlDict entry # [FOAM_SETNAN] - Memory initialisation as NaN
# for memory initialisation (true|false) # - overrides the 'setNaN' controlDict entry
# = true | false
#setenv FOAM_SETNAN false #setenv FOAM_SETNAN false
# [WM_OSTYPE] - Operating System Type:
# = POSIX
#setenv WM_OSTYPE POSIX
################################################################################ ################################################################################
@ -194,21 +191,21 @@ end
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
set foamClean=$WM_PROJECT_DIR/bin/foamCleanPath set foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
#- prevent local variables from shadowing setenv variables # Prevent local variables from shadowing setenv variables
unset PATH MANPATH LD_LIBRARY_PATH LD_PRELOAD unset PATH MANPATH LD_LIBRARY_PATH LD_PRELOAD
if (! $?LD_LIBRARY_PATH ) setenv LD_LIBRARY_PATH if (! $?LD_LIBRARY_PATH ) setenv LD_LIBRARY_PATH
if (! $?MANPATH ) setenv MANPATH if (! $?MANPATH ) setenv MANPATH
#- Clean PATH (path) # Clean PATH (path)
set cleaned=`$foamClean "$PATH" "$foamOldDirs"` set cleaned=`$foamClean "$PATH" "$foamOldDirs"`
if ( $status == 0 ) setenv PATH $cleaned if ( $status == 0 ) setenv PATH $cleaned
#- Clean LD_LIBRARY_PATH # Clean LD_LIBRARY_PATH
set cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` set cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"`
if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
#- Clean MANPATH # Clean MANPATH
set cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` set cleaned=`$foamClean "$MANPATH" "$foamOldDirs"`
if ( $status == 0 ) setenv MANPATH $cleaned if ( $status == 0 ) setenv MANPATH $cleaned
@ -237,19 +234,19 @@ _foamEtc config.csh/FFTW
# Clean environment paths again. Only remove duplicates # Clean environment paths again. Only remove duplicates
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#- Clean PATH (path) # Clean PATH (path)
set cleaned=`$foamClean "$PATH"` set cleaned=`$foamClean "$PATH"`
if ( $status == 0 ) setenv PATH $cleaned if ( $status == 0 ) setenv PATH $cleaned
#- Clean LD_LIBRARY_PATH # Clean LD_LIBRARY_PATH
set cleaned=`$foamClean "$LD_LIBRARY_PATH"` set cleaned=`$foamClean "$LD_LIBRARY_PATH"`
if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
#- Clean MANPATH (trailing ':' to find system pages) # Clean MANPATH (trailing ':' to find system pages)
set cleaned=`$foamClean "$MANPATH"` set cleaned=`$foamClean "$MANPATH"`
if ( $status == 0 ) setenv MANPATH "${cleaned}:" if ( $status == 0 ) setenv MANPATH "${cleaned}:"
#- Clean LD_PRELOAD # Clean LD_PRELOAD
if ( $?LD_PRELOAD ) then if ( $?LD_PRELOAD ) then
set cleaned=`$foamClean "$LD_PRELOAD"` set cleaned=`$foamClean "$LD_PRELOAD"`
if ( $status == 0 ) setenv LD_PRELOAD $cleaned if ( $status == 0 ) setenv LD_PRELOAD $cleaned