Merge branch 'config-thirdparty' into 'develop'

update for third-party versions

See merge request Development/OpenFOAM-plus!185
This commit is contained in:
Mark Olesen
2017-12-15 12:28:37 +00:00
78 changed files with 544 additions and 326 deletions

View File

@ -7,26 +7,14 @@
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#-------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM.
#
# 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/>.
# This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
#
# Script
# foamCleanPath
#
# Description
# Usage: foamCleanPath [-strip] path [wildcard] .. [wildcard]
# Usage: foamCleanPath [OPTION] path [wildcard] .. [wildcard]
#
# Prints its argument (which should be a ':' separated path)
# without the following:
@ -46,6 +34,7 @@ Usage: ${0##*/} [OPTION] path [wildcard1] .. [wildcardN]
options:
-debug print debug information to stderr
-strip remove inaccessible directories
-verbose report some progress (input, output, ...)
-help print the usage
Prints its argument (which should be a ':' separated list) cleansed from
@ -64,7 +53,7 @@ USAGE
# Parse options
unset optDebug optStrip
unset optDebug optStrip optVerbose
while [ "$#" -gt 0 ]
do
case "$1" in
@ -77,6 +66,9 @@ do
-strip)
optStrip=true
;;
-verbose)
optVerbose=true
;;
*)
break
;;
@ -117,13 +109,17 @@ oldIFS="$IFS" # Preserve initial IFS
IFS=': ' # Split on colon, whitespace
set -- $*
if [ -n "$optVerbose" ]
then
echo "clean: $dirList" 1>&2
echo "with: $@" 1>&2
fi
printDebug "input>$dirList<"
# Strip out wildcards via sed. Path and wildcard cannot contain '?'.
while [ "$#" -ge 1 ]
for wildcard
do
wildcard="$1"
shift
if [ -n "$wildcard" ]
then
printDebug "remove>$wildcard<"
@ -157,6 +153,12 @@ do
done
printDebug "output>$dirList<"
if [ -n "$optVerbose" ]
then
echo "output: $dirList" 1>&2
fi
echo "$dirList"
#------------------------------------------------------------------------------

View File

@ -13,31 +13,27 @@
# etc/config.csh/ADIOS
#
# Description
# Setup file for ADIOS include/libraries.
# Setup for ADIOS include/libraries (usually ThirdParty installation).
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
#
# If using system-wide installations, use the following settings:
# To disable its use: adios_version=adios-none
# For system-wide installations: adios_version=adios-system
#
# adios_version=adios-system
#
# If the system adios is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# adios_version=adios-none
#
# If using a central installation, but not located under ThirdParty:
# - specify adios-system
# - provide full paths for ADIOS_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use adios-system
# 2. and provide full path for ADIOS_ARCH_PATH
#
# Note
# When building OpenFOAM, any changes made here MUST be made in the
# equivalent config.sh version too, since that is the one which will
# be used during the build process. See further notes there.
# Changes made here MUST be made in the equivalent config.sh version too,
# since that is the one used in the build process.
# See further notes there.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set adios_version=ADIOS-1.12.0
set adios_version=ADIOS-1.13.0
setenv ADIOS_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
# END OF (NORMAL) USER EDITABLE PART

43
etc/config.csh/ADIOS2 Normal file
View File

@ -0,0 +1,43 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
#
# File
# etc/config.csh/ADIOS2
#
# Description
# Setup for ADIOS2 include/libraries (usually ThirdParty installation).
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
#
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set adios2_version=ADIOS2-git
setenv ADIOS2_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios2_version
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using adios ($adios2_version) -> $ADIOS2_ARCH_PATH"
endif
# If *_ARCH_PATH does not end with '-system' or '-none',
# it is located within ThirdParty, or a central installation
# outside of ThirdParty and should be added to the path.
set ending="${ADIOS2_ARCH_PATH:t}"
if ( "$ending" != "adios-none" && "$ending" != "adios-system" ) then
# PATH was already cleaned by etc/cshrc caller
_foamAddPath $ADIOS2_ARCH_PATH/bin
endif
unset adios_version ending
#------------------------------------------------------------------------------

View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
@ -16,26 +16,24 @@
# Setup file for CGAL (& boost) include/libraries.
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
#
# If using system-wide installations, use the following settings:
#
# boost_version=boost-system
# cgal_version=cgal-system
#
# If the system boost/cgal is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# To disable its use:
# boost_version=boost-none
# cgal_version=cgal-none
#
# If using a central installation, but not located under ThirdParty:
# - specify boost-system / cgal-system
# - provide full paths for BOOST_ARCH_PATH / CGAL_ARCH_PATH
# For system-wide installations:
# boost_version=boost-system
# cgal_version=cgal-system
#
# For central installations not located under ThirdParty:
# 1. use boost-system / cgal-system
# 2. and provide full paths for BOOST_ARCH_PATH / CGAL_ARCH_PATH
#
# Note
# When building OpenFOAM, any changes made here MUST be made in the
# equivalent config.sh version too, since that is the one which will
# be used during the build process.
# Changes made here MUST be made in the equivalent config.sh version too,
# since that is the one used in the build process.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -13,31 +13,26 @@
# etc/config.csh/FFTW
#
# Description
# Setup file for FFTW include/libraries.
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
# Setup for FFTW include/libraries (usually ThirdParty installation).
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
# If using system-wide installations, use the following settings:
# To disable its use: fftw_version=fftw-none
# For system-wide installations: fftw_version=fftw-system
#
# fftw_version=fftw-system
#
# If the system fftw is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# fftw_version=fftw-none
#
# If using a central installation, but not located under ThirdParty:
# - specify fftw-system
# - provide full paths for FFTW_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use fftw-system
# 2. and provide full path for FFTW_ARCH_PATH
#
# Note
# When building OpenFOAM, any changes made here MUST be made in the
# equivalent config.sh version too, since that is the one which will
# be used during the build process.
# Changes made here MUST be made in the equivalent config.sh version too,
# since that is the one used in the build process.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set fftw_version=fftw-3.3.6-pl1
set fftw_version=fftw-3.3.7
setenv FFTW_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
# END OF (NORMAL) USER EDITABLE PART

View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License

View File

@ -13,7 +13,7 @@
# etc/config.csh/compiler
#
# Description
# Setup file for custom compiler versions for OpenFOAM
# Setup for custom compiler versions for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/config.csh/settings
#
#------------------------------------------------------------------------------

View File

@ -10,10 +10,10 @@
# <http://www.gnu.org/licenses/>.
#
# File
# config.csh/ensight
# etc/config.csh/ensight
#
# Description
# Setup file for Ensight
# Setup for ENSIGHT
# Sourced from OpenFOAM-*/etc/cshrc
#
#------------------------------------------------------------------------------

View File

@ -13,7 +13,7 @@
# etc/config.csh/mpi
#
# Description
# Setup file for communications library (MPI) for OpenFOAM
# Setup for MPI communications library for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
#
# For USERMPI, the user is responsible for supplying an appropriate

View File

@ -13,12 +13,11 @@
# config.csh/paraview
#
# Description
# Setup file for paraview (and cmake)
# Setup for PARAVIEW (partially cmake, qt too)
# Sourced from OpenFOAM-<VERSION>/etc/cshrc or from foamPV alias
#
# If using system-wide installation for cmake, use the following settings:
#
# cmake_version=cmake-system
# For system-wide cmake: cmake_version=cmake-system
# For system-wide qt: ParaView_QT=qt-system
#
# Note
# The following env. variables are required for building plugins:
@ -26,40 +25,45 @@
# ParaView_INCLUDE_DIR
# PV_PLUGIN_PATH
#
# If using a central installation not located under ThirdParty, you will
# need to set some environment values directly. For example,
# For central installations not located under ThirdParty, the environment
# values must be set manually. For example,
#
# setenv ParaView_DIR /opt/paraview/paraview-5.0.1
# setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-5.0
# setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-5.0
# setenv ParaView_DIR /opt/paraview/paraview-5.4.1
# setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-5.4
# setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-5.4
#
# setenv PATH ${ParaView_DIR}/bin:${PATH}
# setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.0:${LD_LIBRARY_PATH}
# setenv LD_LIBRARY_PATH ${ParaView_DIR}/lib/paraview-5.4:${LD_LIBRARY_PATH}
# unsetenv ParaView_VERSION # avoid using ThirdParty settings
#
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
setenv ParaView_VERSION 5.4.0
setenv ParaView_MAJOR detect # Automatically determine major version
setenv ParaView_VERSION 5.4.1
set ParaView_QT=qt-system
set cmake_version=cmake-system
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
set pv_api=auto # Normally auto or pair of digits (eg, '5.4' etc)
if (! $?ParaView_DIR ) setenv ParaView_DIR
if (! $?WM_COMPILER_LIB_ARCH ) setenv WM_COMPILER_LIB_ARCH
# Compiler-specific location for ThirdParty installations
set archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
# Clean PATH and LD_LIBRARY_PATH
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/ParaView-"`
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$PATH" "$ParaView_DIR $archDir/cmake- $archDir/qt- $archDir/ParaView-"`
if ( $status == 0 ) setenv PATH $cleaned
if ( $?LD_LIBRARY_PATH ) then
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$LD_LIBRARY_PATH" "$ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/ParaView-"`
set cleaned=`$WM_PROJECT_DIR/bin/foamCleanPath "$LD_LIBRARY_PATH" "$ParaView_DIR $archDir/qt- $archDir/ParaView-"`
if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
endif
# ThirdParty cmake
set cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake_version
set cmake=$archDir/$cmake_version
if ( -r $cmake/bin/cmake ) then
# _foamAddPath not available when foamPV alias is used
setenv PATH $cmake/bin:${PATH}
@ -81,34 +85,43 @@ end
# Avoids conflict with an alternative (non-ThirdParty) installation.
if ( $?ParaView_VERSION ) then
# Set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
# Set API to correspond to VERSION
# pv_api is <digits>.<digits> from ParaView_VERSION
if (! $?pv_api ) set pv_api=auto
switch ("$ParaView_VERSION")
case "$ParaView_MAJOR".*:
# Version and major appear to correspond
case "$pv_api".*:
# API and VERSION appear to correspond
breaksw
case [0-9]*:
# Extract major from the version
setenv ParaView_MAJOR `echo ${ParaView_VERSION} | \
# Extract API from VERSION
set pv_api=`echo ${ParaView_VERSION} | \
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
breaksw
endsw
set pvName=ParaView-$ParaView_VERSION
set pvMajor=paraview-$ParaView_MAJOR
setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$pvName
setenv ParaView_DIR $archDir/ParaView-$ParaView_VERSION
set pvSubDir=paraview-$pv_api
# Set paths if binaries are present
if ( -r $ParaView_DIR ) then
set pvLibDir=${ParaView_DIR}/lib/$pvMajor
set pvLibDir=${ParaView_DIR}/lib/$pvSubDir
set pvPython=$ParaView_DIR/Utilities/VTKPythonWrapping
setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/$pvMajor
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/$pvMajor
setenv LD_LIBRARY_PATH "${pvLibDir}:${LD_LIBRARY_PATH}"
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/$pvSubDir
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/$pvSubDir
# Add in qt libraries as required
set qtDir="$archDir/$ParaView_QT"
if ( -d "$qtDir" ) then
foreach qtLibDir ("$qtDir/lib$WM_COMPILER_LIB_ARCH" "$qtDir/lib")
if ( -d "$qtLibDir" ) then
setenv LD_LIBRARY_PATH "${qtLibDir}:${LD_LIBRARY_PATH}"
break
endif
end
endif
# Add in python libraries if required
if ( -r $pvPython ) then
@ -119,6 +132,9 @@ if ( $?ParaView_VERSION ) then
endif
endif
# Prepend paraview libraries
setenv LD_LIBRARY_PATH "${pvLibDir}:${LD_LIBRARY_PATH}"
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using paraview"
echo " ParaView_DIR : $ParaView_DIR"
@ -138,7 +154,9 @@ if ( $?ParaView_VERSION ) then
endif
unset cleaned cmake cmake_version pvName pvMajor pvLibDir pvPython
unsetenv ParaView_MAJOR ParaView_VERSION
unset cleaned archDir
unset cmake cmake_version
unset pv_api pvSubDir pvLibDir pvPython qtDir qtLibDir
unsetenv ParaView_VERSION ParaView_QT
#------------------------------------------------------------------------------

View File

@ -13,8 +13,7 @@
# etc/config.csh/settings
#
# Description
# Setup file for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
# Settings for OpenFOAM, sourced from OpenFOAM-<VERSION>/etc/cshrc
#
#------------------------------------------------------------------------------

View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
@ -109,7 +109,6 @@ unsetenv OPAL_PREFIX
unsetenv ENSIGHT9_READER
unsetenv ParaView_DIR
unsetenv ParaView_INCLUDE_DIR
unsetenv ParaView_MAJOR
unsetenv ParaView_VERSION
unsetenv PV_PLUGIN_PATH
unsetenv VTK_DIR
@ -118,6 +117,8 @@ unsetenv VTK_DIR
# unset other ThirdParty environment variables
unsetenv ADIOS_ARCH_PATH
unsetenv ADIOS1_ARCH_PATH
unsetenv ADIOS2_ARCH_PATH
unsetenv BOOST_ARCH_PATH
unsetenv CCMIO_ARCH_PATH
unsetenv CGAL_ARCH_PATH
@ -141,14 +142,12 @@ if ( $?foamClean ) then
if ($?LD_LIBRARY_PATH) then
set cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"`
if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
if ( ${%LD_LIBRARY_PATH} == 0 ) unsetenv LD_LIBRARY_PATH
endif
if ($?MANPATH) then
set cleaned=`$foamClean "$MANPATH" "$foamOldDirs"`
if ( $status == 0 ) setenv MANPATH $cleaned
if ( ${%MANPATH} == 0 ) unsetenv MANPATH
endif

View File

@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -20,9 +20,8 @@
# actually exist at the time of sourcing.
#
# Note
# When building OpenFOAM, any changes made here MUST be made in the
# equivalent config.sh version too, since that is the one which will
# be used during the build process.
# Changes made here MUST be made in the equivalent config.sh version too,
# since that is the one used in the build process.
#
# It is recommended to use VTK sources from ParaView (5.0.1 or later)
#

View File

@ -13,30 +13,26 @@
# etc/config.sh/ADIOS
#
# Description
# Setup file for ADIOS include/libraries.
# Setup for ADIOS include/libraries (usually ThirdParty installation).
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
# If using system-wide installations, use the following settings:
# To disable its use: adios_version=adios-none
# For system-wide installations: adios_version=adios-system
#
# adios_version=adios-system
#
# If the system adios is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# adios_version=adios-none
#
# If using a central installation, but not located under ThirdParty:
# - specify adios-system
# - provide full paths for ADIOS_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use adios-system
# 2. and provide full path for ADIOS_ARCH_PATH
#
# Note
# Since ADIOS is a static library build, the libraries are renamed
# for the appropriate MPI. Eg, libadios_openmpi-system
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
adios_version=ADIOS-1.12.0
adios_version=ADIOS-1.13.0
export ADIOS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
# END OF (NORMAL) USER EDITABLE PART

49
etc/config.sh/ADIOS2 Normal file
View File

@ -0,0 +1,49 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2017 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
# <http://www.gnu.org/licenses/>.
#
# File
# etc/config.sh/ADIOS2
#
# Description
# Setup for ADIOS2 include/libraries (usually ThirdParty installation).
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
adios2_version=ADIOS2-git
export ADIOS2_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios2_version
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
echo "Using adios ($adios2_version) -> $ADIOS2_ARCH_PATH" 1>&2
fi
if command -v _foamAddPath >/dev/null 2>&1 # normal sourcing
then
# If *_ARCH_PATH does not end with '-system' or '-none',
# it is located within ThirdParty, or a central installation
# outside of ThirdParty and should be added to the path.
ending="${ADIOS2_ARCH_PATH##*-}"
if [ "$ending" != none -a "$ending" != system ]
then
# PATH was already cleaned by etc/bashrc caller
_foamAddPath $ADIOS2_ARCH_PATH/bin
fi
unset adios2_version ending
fi
#------------------------------------------------------------------------------

View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
@ -16,25 +16,25 @@
# Setup file for CGAL (& boost) include/libraries.
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
# If using system-wide installations, use the following settings:
#
# boost_version=boost-system
# cgal_version=cgal-system
#
# If the system boost/cgal is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# To disable its use:
# boost_version=boost-none
# cgal_version=cgal-none
#
# If using a central installation, but not located under ThirdParty:
# - specify boost-system / cgal-system
# - provide full paths for BOOST_ARCH_PATH / CGAL_ARCH_PATH
# For system-wide installations:
# boost_version=boost-system
# cgal_version=cgal-system
#
# For central installations not located under ThirdParty:
# 1. use boost-system / cgal-system
# 2. and provide full paths for BOOST_ARCH_PATH / CGAL_ARCH_PATH
#
# Note
# When _foamAddLib is unset (eg, called from makeCGAL):
# - boost_version / cgal_version variables are retained.
# - the LD_LIBRARY_PATH is not adjusted.
# - boost_version / cgal_version variables are retained.
# - the LD_LIBRARY_PATH is not adjusted.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -13,30 +13,27 @@
# etc/config.sh/FFTW
#
# Description
# Setup file for FFTW include/libraries.
# Setup for FFTW include/libraries (usually ThirdParty installation).
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
# If using system-wide installations, use the following settings:
# To disable its use: fftw_version=fftw-none
# For system-wide installations: fftw_version=fftw-system
#
# fftw_version=fftw-system
#
# If the system fftw is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# fftw_version=fftw-none
#
# If using a central installation, but not located under ThirdParty:
# - specify fftw-system
# - provide full paths for FFTW_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use fftw-system
# 2. and provide full path for FFTW_ARCH_PATH
#
# Note
# When _foamAddLib is unset (eg, called from makeFFTW):
# - fftw_version variable is retained.
# - the LD_LIBRARY_PATH is not adjusted.
# - fftw_version variable is retained.
# - LD_LIBRARY_PATH is not adjusted.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
fftw_version=fftw-3.3.6-pl1
fftw_version=fftw-3.3.7
export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
# END OF (NORMAL) USER EDITABLE PART

View File

@ -92,10 +92,15 @@ foamVersion()
# Change ParaView version
# ~~~~~~~~~~~~~~~~~~~~~~~
# pass in first value directly (eg, 5.4.1) and transform to
# ParaView_VERSION=...
# Any additional arguments must be fully specified and start with "ParaView".
# Eg,
# ParaView_QT=...
unset -f foamPV 2>/dev/null
foamPV()
{
. $WM_PROJECT_DIR/etc/config.sh/paraview "${@+ParaView_VERSION=$1}"
. $WM_PROJECT_DIR/etc/config.sh/paraview "${@+ParaView_VERSION=$@}"
local pvdir="${ParaView_DIR##*/}"
echo "${pvdir:-ParaView_DIR not set}" 1>&2
}

View File

@ -13,15 +13,15 @@
# etc/config.sh/ccmio
#
# Description
# Setup file for libccmio include/libraries.
# Setup for LIBCCMIO include/libraries.
# Sourced during wmake process only.
#
# Static libraries (recommended) are found under CCMIO_ARCH_PATH/lib.
# Dynamic libraries are found under FOAM_EXT_LIBBIN path.
#
# Note
# A csh version is not needed, since the values here are only sourced
# during the wmake process
# No csh version. This file is only used by wmake.
#
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -13,7 +13,7 @@
# etc/config.sh/compiler
#
# Description
# Setup file for custom compiler versions for OpenFOAM
# Setup for custom compiler versions for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/config.sh/settings
#
#------------------------------------------------------------------------------

View File

@ -13,7 +13,7 @@
# etc/config.sh/ensight
#
# Description
# Setup file for Ensight
# Setup for ENSIGHT
# Sourced from OpenFOAM-*/etc/bashrc
#
#------------------------------------------------------------------------------

View File

@ -13,26 +13,25 @@
# etc/config.sh/gperftools
#
# Description
# Setup file for gperftools binaries and libraries.
# Setup file for GPERFTOOLS binaries/libraries.
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
# If using system-wide installations, use the following settings:
# To disable its use: gperftools_version=gperftools-none
# For system-wide installations: gperftools_version=gperftools-system
#
# gperftools_version=gperftools-system
#
# If the system gperftools is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# gperftools_version=gperftools-none
#
# If using a central installation, but not located under ThirdParty:
# - specify gperftools-system
# - provide full paths for GPERFTOOLS_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use gperftools-system
# 2. and provide full path for GPERFTOOLS_ARCH_PATH
#
# Note
# When _foamAddLib is unset (eg, called from makeGperftools):
# - gperftools_version variable are retained.
# - the LD_LIBRARY_PATH and PATH are not adjusted.
# - gperftools_version variable are retained.
# - the LD_LIBRARY_PATH and PATH are not adjusted.
#
# No csh version, This file is only used by wmake.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -13,36 +13,25 @@
# etc/config.sh/kahip
#
# Description
# Setup for kahip include/libraries.
# Setup for KAHIP include/libraries (usually ThirdParty installation).
# Sourced during wmake process only.
#
# Normally used to specify the kahip version and location for a
# ThirdParty installation.
# To disable its use: KAHIP_VERSION=kahip-none
# For system-wide installations: KAHIP_VERSION=kahip-system
#
# If using system-wide installations, use the following setting:
#
# KAHIP_VERSION=kahip-system
#
# If the system kahip is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# KAHIP_VERSION=kahip-none
#
# If using a central installation, but not located under ThirdParty:
# - specify kahip-system
# - provide full path for KAHIP_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use kahip-system
# 2. and provide full path for KAHIP_ARCH_PATH
#
# Note
# A csh version is not needed, since the values here are only sourced
# during the wmake process.
#
# KaHIP can also be entirely disabled, by either renaming this file or
# by creating an empty one with the same name at a user or site location.
#
# KaHIP is 32-bit precision only.
# An Int64 OpenFOAM version can use it, but the mesh size is limited
# accordingly.
#
# No csh version, This file is only used by wmake.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation
# \\/ M anipulation |
# \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
@ -13,32 +13,21 @@
# etc/config.sh/metis
#
# Description
# Setup file for metis include/libraries.
# Setup for METIS include/libraries (usually ThirdParty installation).
# Sourced during wmake process only.
#
# Normally used to specify the metis version and location for a
# ThirdParty installation.
# To disable its use: METIS_VERSION=metis-none
# For system-wide installations: METIS_VERSION=metis-system
#
# If using system-wide installations, use the following setting:
#
# METIS_VERSION=metis-system
#
# If the system metis is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# METIS_VERSION=metis-none
#
# If using a central installation, but not located under ThirdParty:
# - specify metis-system
# - provide full path for METIS_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use metis-system
# 2. and provide full path for METIS_ARCH_PATH
#
# Note
# A csh version is not needed, since the values here are only sourced
# during the wmake process.
#
# Metis can also be entirely disabled, by either renaming this file or
# by creating an empty one with the same name at a user or site location.
# No csh version. This file is only used by wmake.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -13,32 +13,24 @@
# etc/config.sh/mgridgen
#
# Description
# Setup file for MGridGen include/libraries.
# Setup for MGRIDGEN include/libraries (usually ThirdParty installation).
# Sourced during wmake process only.
#
# Normally used to specify the MGridGen version and location for a
# ThirdParty installation.
#
# If using system-wide installations, use the following setting:
# To disable its use: MGRIDGEN_VERSION=mgridgen-none
# For system-wide installations: MGRIDGEN_VERSION=mgridgen-system
#
# MGRIDGEN_VERSION=mgridgen-system
#
# If the system mgridgen is unusable and you don't have or want
# a ThirdParty installation:
#
# MGRIDGEN_VERSION=mgridgen-none
#
# If using a central installation, but not located under ThirdParty:
# - specify mgridgen-system
# - provide full path for MGRIDGEN_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use mgridgen-system
# 2. and provide full path for MGRIDGEN_ARCH_PATH
#
# Note
# A csh version is not needed, since the values here are only sourced
# during the wmake process.
#
# MGridGen can be entirely disabled, by either renaming this file or
# by creating an empty one with the same name at a user or site location.
# No csh version. This file is only used by wmake.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -13,7 +13,7 @@
# etc/config.sh/mpi
#
# Description
# Setup file for communications library (MPI) for OpenFOAM
# Setup for MPI communications library for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
# For USERMPI, the user is responsible for supplying an appropriate

View File

@ -13,12 +13,11 @@
# etc/config.sh/paraview
#
# Description
# Setup file for paraview (& cmake)
# Setup for PARAVIEW (partially cmake, qt too)
# Sourced from OpenFOAM-<VERSION>/etc/bashrc or from foamPV alias
#
# If using system-wide installation for cmake, use the following settings:
#
# cmake_version=cmake-system
# For system-wide cmake: cmake_version=cmake-system
# For system-wide qt: ParaView_QT=qt-system
#
# Note
# The following env. variables are required for building plugins:
@ -26,47 +25,48 @@
# ParaView_INCLUDE_DIR
# PV_PLUGIN_PATH
#
# If using a central installation not located under ThirdParty, you will
# need to set some environment values directly. For example,
# For central installations not located under ThirdParty, the environment
# values must be set manually. For example,
#
# export ParaView_DIR=/opt/paraview/paraview-5.0.1
# export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-5.0
# export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-5.0
# export ParaView_DIR=/opt/paraview/paraview-5.4.1
# export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-5.4
# export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-5.4
#
# export PATH=$ParaView_DIR/bin:$PATH
# export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.0:$LD_LIBRARY_PATH
# export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-5.4:$LD_LIBRARY_PATH
# unset ParaView_VERSION # avoid using ThirdParty settings
#
# Note
# When _foamAddLib is unset (eg, called from makeParaView or from foamPV):
# - the ParaView_VERSION variable is retained.
# - the ParaView_VERSION variable is retained.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
ParaView_VERSION=5.4.0
ParaView_MAJOR=detect # Automatically determine major version
ParaView_VERSION=5.4.1
ParaView_QT=qt-system
cmake_version=cmake-system
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
pv_api=auto # Normally auto or pair of digits (eg, '5.4' etc)
# Compiler-specific location for ThirdParty installations
archDir="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER"
# Clean PATH and LD_LIBRARY_PATH
cleaned=$($WM_PROJECT_DIR/bin/foamCleanPath "$PATH" \
"$ParaView_DIR \
$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/cmake- \
$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/ParaView-" \
"$ParaView_DIR $archDir/cmake- $archDir/qt- $archDir/ParaView-" \
) && PATH="$cleaned"
if [ -n "$LD_LIBRARY_PATH" ]
then
cleaned=$($WM_PROJECT_DIR/bin/foamCleanPath "$LD_LIBRARY_PATH" \
"$ParaView_DIR \
$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/ParaView-" \
"$ParaView_DIR $archDir/qt- $archDir/ParaView-" \
) && LD_LIBRARY_PATH="$cleaned"
fi
# ThirdParty cmake
cmake=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cmake_version
cmake=$archDir/$cmake_version
if [ -r $cmake/bin/cmake ]
then
# _foamAddPath not available when foamPV function is used
@ -96,34 +96,48 @@ _foamParaviewEval $@
if [ -n "$ParaView_VERSION" ]
then
# Set MAJOR version to correspond to VERSION
# ParaView_MAJOR is "<digits>.<digits>" from ParaView_VERSION
# Set API to correspond to VERSION
# pv_api is <digits>.<digits> from ParaView_VERSION
case "$ParaView_VERSION" in
"$ParaView_MAJOR".* )
# Version and major appear to correspond
"$pv_api".* )
# API and VERSION appear to correspond
;;
[0-9]*)
# Extract major from the version
ParaView_MAJOR=$(echo $ParaView_VERSION | \
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
# Extract API from VERSION
pv_api=$(echo $ParaView_VERSION | \
sed -e 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/')
;;
esac
pvName=ParaView-$ParaView_VERSION
pvMajor=paraview-$ParaView_MAJOR
export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$pvName
export ParaView_DIR=$archDir/ParaView-$ParaView_VERSION
pvSubDir=paraview-$pv_api
# Set paths if binaries are present
if [ -r $ParaView_DIR ]
then
pvLibDir=$ParaView_DIR/lib/$pvMajor
pvLibDir=$ParaView_DIR/lib/$pvSubDir
pvPython=$ParaView_DIR/Utilities/VTKPythonWrapping
export PATH=$ParaView_DIR/bin:$PATH
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/$pvMajor
export PV_PLUGIN_PATH=$FOAM_LIBBIN/$pvMajor
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/$pvSubDir
export PV_PLUGIN_PATH=$FOAM_LIBBIN/$pvSubDir
# Add in qt libraries as required
qtDir="$archDir/$ParaView_QT"
if [ -d "$qtDir" ]
then
for qtLibDir in $qtDir/lib$WM_COMPILER_LIB_ARCH $qtDir/lib
do
if [ -d "$qtLibDir" ]
then
export LD_LIBRARY_PATH=$qtLibDir:$LD_LIBRARY_PATH
break
fi
done
fi
# Prepend paraview libraries
export LD_LIBRARY_PATH=$pvLibDir:$LD_LIBRARY_PATH
# Add in python libraries if required
@ -158,12 +172,13 @@ then
fi
unset -f _foamParaviewEval 2> /dev/null
unset cleaned cmake cmake_version pvName pvMajor pvLibDir pvPython
unset ParaView_MAJOR
unset cleaned archDir
unset cmake cmake_version
unset pv_api pvSubDir pvLibDir pvPython qtDir qtLibDir
if command -v _foamAddLib > /dev/null 2>&1 # normal sourcing
then
unset ParaView_VERSION
unset ParaView_VERSION ParaView_QT
fi
#------------------------------------------------------------------------------

View File

@ -3,7 +3,7 @@
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
# \\/ M anipulation |
# \\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, licensed under GNU General Public License
@ -13,32 +13,21 @@
# etc/config.sh/scotch
#
# Description
# Setup file for scotch include/libraries.
# Setup for SCOTCH include/libraries (usually ThirdParty installation).
# Sourced during wmake process only.
#
# Normally used to specify the scotch version and location for a
# ThirdParty installation.
# To disable its use: SCOTCH_VERSION=scotch-none
# For system-wide installations: SCOTCH_VERSION=scotch-system
#
# If using system-wide installations, use the following setting:
#
# SCOTCH_VERSION=scotch-system
#
# If the system scotch is unusable (eg, too old) and you don't
# have or want a ThirdParty installation:
#
# SCOTCH_VERSION=scotch-none
#
# If using a central installation, but not located under ThirdParty:
# - specify scotch-system
# - provide full path for SCOTCH_ARCH_PATH
# For central installations not located under ThirdParty:
# 1. use scotch-system
# 2. and provide full path for SCOTCH_ARCH_PATH
#
# Note
# A csh version is not needed, since the values here are only sourced
# during the wmake process.
#
# Scotch can also be entirely disabled, by either renaming this file or
# by creating an empty one with the same name at a user or site location.
# No csh version. This file is only used by wmake.
#
# Can also disable by renaming/removing this file or by creating an empty
# file with the same name at a user or site location.
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

View File

@ -13,8 +13,7 @@
# etc/config.sh/settings
#
# Description
# Setup file for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
# Settings for OpenFOAM, sourced from OpenFOAM-<VERSION>/etc/bashrc
#
#------------------------------------------------------------------------------
export WM_ARCH=$(uname -s) # System name

View File

@ -105,7 +105,6 @@ fi
unset ENSIGHT9_READER
unset ParaView_DIR
unset ParaView_INCLUDE_DIR
unset ParaView_MAJOR
unset ParaView_VERSION
unset PV_PLUGIN_PATH
unset VTK_DIR
@ -114,6 +113,8 @@ unset VTK_DIR
# unset other ThirdParty environment variables
unset ADIOS_ARCH_PATH
unset ADIOS1_ARCH_PATH
unset ADIOS2_ARCH_PATH
unset BOOST_ARCH_PATH
unset CCMIO_ARCH_PATH
unset CGAL_ARCH_PATH

View File

@ -2,7 +2,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2016 OpenCFD Ltd.
# \\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
# \\/ M anipulation |
#------------------------------------------------------------------------------
# License
@ -21,8 +21,8 @@
#
# Note
# When _foamAddLib is unset
# - the vtk_version, mesa_version variables are retained.
# (for future integration into ThirdParty build)
# - vtk_version, mesa_version variables are retained.
# (for future integration into ThirdParty build)
#
# It is recommended to use VTK sources from ParaView (5.0.1 or later)
#

View File

@ -0,0 +1,13 @@
#-------------------------------*- makefile -*---------------------------------
# ADIOS2 includes/libraries
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
# Obtain prefix and library information via adios2-config
ADIOS_PREFIX := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --prefix)
ADIOS_LIBS := $(shell $(ADIOS2_ARCH_PATH)/bin/adios2-config --libs)
ADIOS_INC = -I${ADIOS_PREFIX}/include
#------------------------------------------------------------------------------

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = clang -m64

View File

@ -1,2 +1,2 @@
c++DBUG = -g -DFULLDEBUG
c++DBUG = -g -DFULLDEBUG
c++OPT = -O0

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = cc -m64

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = gcc -m64

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = gcc -m64 -march=knl

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN =
cWARN =
cc = icc

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN =
cWARN =
cc = icc

View File

@ -0,0 +1,17 @@
SUFFIXES += .c
cWARN = -Wall
## cc = clang -m64
cc = clang
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

View File

@ -0,0 +1,25 @@
SUFFIXES += .C .cc .cpp .cxx
c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter -Wno-invalid-offsetof -Wno-undefined-var-template
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-tautological-undefined-compare -Wno-shift-negative-value
## CC = clang++ -std=c++11 -m64
CC = clang++ -std=c++11
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed

View File

@ -0,0 +1,2 @@
c++DBUG = -g -DFULLDEBUG
c++OPT = -O0

View File

@ -0,0 +1,2 @@
c++DBUG =
c++OPT = -O3

View File

@ -0,0 +1,2 @@
c++DBUG = -pg
c++OPT = -O2

View File

@ -0,0 +1,2 @@
cDBUG = -g -DFULLDEBUG
cOPT = -O0

View File

@ -0,0 +1,2 @@
cDBUG =
cOPT = -O3

View File

@ -0,0 +1,2 @@
cDBUG = -pg
cOPT = -O2

View File

@ -0,0 +1,9 @@
CPP = cpp -traditional-cpp $(GFLAGS)
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard
include $(DEFAULT_RULES)/openmp
include $(DEFAULT_RULES)/c
include $(DEFAULT_RULES)/c++

View File

@ -0,0 +1,4 @@
# Flags for compiling/linking openmp
COMP_OPENMP = -DUSE_OMP -fopenmp
LINK_OPENMP = -lgomp

View File

@ -0,0 +1,16 @@
SUFFIXES += .c
cWARN = -Wall
cc = gcc
include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
cFLAGS = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
ctoo = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
LINK_LIBS = $(cDBUG)
LINKLIBSO = $(cc) -shared
LINKEXE = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

View File

@ -0,0 +1,25 @@
SUFFIXES += .C .cc .cpp .cxx
c++WARN = -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor -Wno-unused-parameter \
-Wno-invalid-offsetof -Wno-attributes
# Suppress some warnings for flex++ and CGAL
c++LESSWARN = -Wno-old-style-cast -Wno-unused-local-typedefs -Wno-array-bounds
CC = g++ -std=c++11
include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
ptFLAGS = -DNoRepository -ftemplate-depth-100
c++FLAGS = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
Ctoo = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
cxxtoo = $(Ctoo)
cctoo = $(Ctoo)
cpptoo = $(Ctoo)
LINK_LIBS = $(c++DBUG)
LINKLIBSO = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
LINKEXE = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

View File

@ -0,0 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -0,0 +1,4 @@
c++DBUG =
c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps
ROUNDING_MATH = -frounding-math

View File

@ -0,0 +1,2 @@
c++DBUG = -pg
c++OPT = -O2

View File

@ -0,0 +1,2 @@
cDBUG = -ggdb -DFULLDEBUG
cOPT = -O1 -fdefault-inline -finline-functions

View File

@ -0,0 +1,2 @@
cDBUG =
cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps

View File

@ -0,0 +1,2 @@
cDBUG = -pg
cOPT = -O2

View File

@ -0,0 +1,10 @@
CPP = cpp -traditional-cpp $(GFLAGS)
LD = ld
PROJECT_LIBS = -l$(WM_PROJECT) -ldl
include $(GENERAL_RULES)/standard
include $(DEFAULT_RULES)/openmp
include $(DEFAULT_RULES)/c
include $(DEFAULT_RULES)/c++

View File

@ -0,0 +1,4 @@
# Flags for compiling/linking openmp
COMP_OPENMP = -DUSE_OMP -fopenmp
LINK_OPENMP = -lgomp

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = gcc

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -1,5 +1,5 @@
c++DBUG =
#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
#c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
c++OPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp
ROUNDING_MATH = -frounding-math

View File

@ -1,3 +1,3 @@
cDBUG =
#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
#cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
cOPT = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -fprefetch-loop-arrays -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=softfp

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = clang -m32

View File

@ -1,2 +1,2 @@
c++DBUG = -g -DFULLDEBUG
c++DBUG = -g -DFULLDEBUG
c++OPT = -O0

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = gcc -m32

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = gcc

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN =
cWARN =
cc = icc

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN =
cWARN =
cc = icc -gcc-version=400

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = gcc -m64 -mcpu=power5+

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline

View File

@ -1,6 +1,6 @@
SUFFIXES += .c
cWARN = -Wall
cWARN = -Wall
cc = gcc -m64 -mcpu=power8

View File

@ -1,2 +1,2 @@
c++DBUG = -ggdb3 -DFULLDEBUG
c++DBUG = -ggdb3 -DFULLDEBUG
c++OPT = -O0 -fdefault-inline