Skip to content
Snippets Groups Projects
Commit c304cc51 authored by Damian Alvarez's avatar Damian Alvarez
Browse files

Merge branch '2020' into '2020' 

new installation OpenFOAM v1812 including ThirdParty software and patches

See merge request hps-public/easybuild-repository!520
parents 6249c7cd c9dfb1f4
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Golden_Repo/o/OpenFOAM/OpenFOAM-v1812-cleanup.patch 0 → 100644
+ 426
− 0
View file @ c304cc51
# - Replace the OpenFOAM third-party libraries with EASYBUILD variables.
# - Set install dir, compiler, etc using EASYBUILD
#
# authors: Ward Poelmans <wpoely86@gmail.com>, Kenneth Hoste (HPC-UGent), Mark Olesen <Mark.Olesen@esi-group.com>,
# Simon Branford (University of Birmingham)
--- OpenFOAM-v1912/etc/bashrc.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/bashrc 2020-01-06 19:13:09.39069861 +0000
@@ -94,7 +94,7 @@
# = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPI | MPICH | MPICH-GM |
# HPMPI | CRAY-MPICH | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI
# Also possible to use INTELMPI-xyz etc and define your own wmake rule
-export WM_MPLIB=SYSTEMOPENMPI
+export WM_MPLIB=EASYBUILDMPI
#------------------------------------------------------------------------------
--- OpenFOAM-v1912/etc/config.sh/CGAL.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/CGAL 2020-01-06 19:13:58.46916514 +0000
@@ -41,33 +41,10 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-boost_version=boost_1_64_0
-cgal_version=CGAL-4.9.1
-
-export BOOST_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
-export CGAL_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version
+##EasyBuild## settings
+export BOOST_ARCH_PATH="$EBROOTBOOST"
+export CGAL_ARCH_PATH="$EBROOTCGAL"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
-if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
-then
- echo "Using boost ($boost_version) -> $BOOST_ARCH_PATH" 1>&2
- echo "Using CGAL ($cgal_version) -> $CGAL_ARCH_PATH" 1>&2
-fi
-
-if command -v _foamAddLibAuto > /dev/null 2>&1 # Normal sourcing (not makeCGAL)
-then
- _foamAddLibAuto $BOOST_ARCH_PATH lib$WM_COMPILER_LIB_ARCH
- _foamAddLibAuto $CGAL_ARCH_PATH lib$WM_COMPILER_LIB_ARCH
-
- # GMP/MPFR may have already been added with ThirdParty compiler, but cannot
- # be certain so add here. Any duplicates will be removed later.
-
- _foamAddLibAuto $GMP_ARCH_PATH # No fallback libdir
- _foamAddLibAuto $MPFR_ARCH_PATH # No fallback libdir
- unset boost_version cgal_version
-
-fi
-
-#------------------------------------------------------------------------------
--- OpenFOAM-v1912/etc/config.sh/FFTW.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/FFTW 2020-01-06 19:14:18.89030368 +0000
@@ -33,23 +33,8 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-fftw_version=fftw-3.3.7
-export FFTW_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$fftw_version
+##EasyBuild## settings
+export FFTW_ARCH_PATH="$EBROOTFFTW"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
-if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
-then
- echo "Using fftw ($fftw_version) -> $FFTW_ARCH_PATH" 1>&2
-fi
-
-if command -v _foamAddLibAuto > /dev/null 2>&1 # Normal sourcing (not makeFFTW)
-then
-
- _foamAddLibAuto $FFTW_ARCH_PATH lib$WM_COMPILER_LIB_ARCH
-
- unset fftw_version
-
-fi
-
-#------------------------------------------------------------------------------
--- OpenFOAM-v1912/etc/config.sh/gperftools.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/gperftools 2020-01-06 19:14:52.90383440 +0000
@@ -35,32 +35,8 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-gperftools_version=gperftools-2.5
-GPERFTOOLS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$gperftools_version
+##EasyBuild## settings
+GPERFTOOLS_ARCH_PATH="$EBROOTGPERFTOOLS"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
-if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
-then
- echo "Using gperftools ($gperftools_version) -> $GPERFTOOLS_ARCH_PATH" 1>&2
-fi
-
-if command -v _foamAddLib > /dev/null 2>&1 # Normal sourcing
-then
-
- # If GPERFTOOLS_ARCH_PATH does not end with '-system' or '-none',
- # it is located within ThirdParty, or a central installation
- # outside of ThirdParty and must be added to the lib-path.
-
- ending="${GPERFTOOLS_ARCH_PATH##*-}"
- if [ "$ending" != none ] && [ "$ending" != system ]
- then
- _foamAddLib $GPERFTOOLS_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
- _foamAddPath $GPERFTOOLS_ARCH_PATH/bin
- fi
-
- unset gperftools_version ending
-
-fi
-
-#------------------------------------------------------------------------------
--- OpenFOAM-v1912/etc/config.sh/metis.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/metis 2020-01-06 19:14:21.70845195 +0000
@@ -34,8 +34,9 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-METIS_VERSION=metis-5.1.0
-export METIS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$METIS_VERSION
+##Easybuild## settings
+METIS_VERSION="metis-$EBVERSIONMETIS"
+[ -d "$METIS_ARCH_PATH" ] || METIS_ARCH_PATH="$METIS_ROOT"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
--- OpenFOAM-v1912/etc/config.sh/mpi.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/mpi 2020-01-06 19:12:41.54940690 +0000
@@ -96,6 +96,10 @@
_foamEtc -config mpi-user # <- Adjustments (optional)
;;
+EASYBUILDMPI)
+ export FOAM_MPI=mpi
+ ;;
+
SYSTEMMPI)
export FOAM_MPI=mpi-system
_foamEtc -config mpi-system # <- Adjustments (optional)
--- OpenFOAM-v1912/etc/config.sh/paraview.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/paraview 2020-01-06 19:12:41.66878632 +0000
@@ -51,7 +51,8 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-ParaView_VERSION=5.6.0
+##Easybuild## settings
+ParaView_VERSION="$EBVERSIONPARAVIEW"
ParaView_QT=qt-system
cmake_version=cmake-system
@@ -82,14 +83,6 @@
esac
done
-# ThirdParty cmake
-cmake="$archDir/$cmake_version"
-if [ -r "$cmake/bin/cmake" ]
-then
- # _foamAddPath not available when foamPV function is used
- PATH="$cmake/bin:$PATH"
-fi
-
case "$ParaView_VERSION" in
('')
# empty - do nothing
@@ -105,6 +98,7 @@
;;
(system)
+ unset PV_PLUGIN_PATH
eval "$($WM_PROJECT_DIR/bin/foamEtcFile -sh ${FOAM_CONFIG_NOUSER:+-mode=o} -config paraview-system)"
;;
@@ -125,7 +119,9 @@
;;
esac
- export ParaView_DIR="$archDir/ParaView-$ParaView_VERSION"
+ ##Easybuild## settings
+ export ParaView_DIR="$EBROOTPARAVIEW"
+ unset PV_PLUGIN_PATH
# Set paths if binaries are present
if [ -r "$ParaView_DIR" ]
@@ -133,48 +129,26 @@
# The OpenFOAM plugin directory must be the first in PV_PLUGIN_PATH
# and have paraview-major.minor encoded in its name
export PV_PLUGIN_PATH="$FOAM_LIBBIN/paraview-$pv_api"
-
export PATH="$ParaView_DIR/bin:$PATH"
- pvLibDir="$ParaView_DIR/lib/paraview-$pv_api"
- #OBSOLETE? pvPython=$ParaView_DIR/Utilities/VTKPythonWrapping
-
- #OBSOLETE? # Python libraries as required
- #OBSOLETE? if [ -r $pvPython ]
- #OBSOLETE? then
- #OBSOLETE? export PYTHONPATH=$PYTHONPATH:${PYTHONPATH:+:}$pvPython:$pvLibDir
- #OBSOLETE? fi
-
- # QT libraries as required, and Qt5_DIR for the root directory.
- # Another possibility: "qtpaths --qt-version"
- qtDir="$archDir/$ParaView_QT"
- if [ -d "$qtDir" ]
- then
- case "$ParaView_QT" in
- (*-5*)
- export Qt5_DIR="$qtDir"
- ;;
- esac
- 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
# ParaView libraries
# - 5.4 and earlier: lib/paraview-X.X
- # - 5.5 and later: lib/
- case "$pv_api" in
- (5.[0-4]*)
- export LD_LIBRARY_PATH="$pvLibDir:$LD_LIBRARY_PATH"
- ;;
- (*)
- export LD_LIBRARY_PATH="$ParaView_DIR/lib:$LD_LIBRARY_PATH"
- ;;
- esac
+ # - 5.5 and later: lib/, but could also be lib64/
+ for libDir in "lib$WM_COMPILER_LIB_ARCH" "lib"
+ do
+ pvLibDir="$libDir/paraview-$pv_api"
+ if [ -d "$ParaView_DIR/$pvLibDir" ]
+ then
+ case "$pv_api" in
+ (5.[0-4]*)
+ libDir="$pvLibDir" # Needs lib/paraview-X.X (not lib)
+ ;;
+ esac
+ export LD_LIBRARY_PATH="$ParaView_DIR/$libDir:$LD_LIBRARY_PATH"
+ break
+ fi
+ unset pvLibDir
+ done
if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
then
@@ -198,13 +172,13 @@
#------------------------------------------------------------------------------
-if command -v _foamAddLib > /dev/null 2>&1 # normal sourcing
+if command -v _foamAddLib >/dev/null # normal sourcing
then
unset ParaView_VERSION ParaView_QT
fi
-unset archDir
+unset archDir libDir
unset cmake cmake_version
-unset pv_api pvLibDir pvPython qtDir qtLibDir
+unset pv_api pvLibDir pvPython qtDir
#------------------------------------------------------------------------------
--- OpenFOAM-v1912/etc/config.sh/scotch.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/scotch 2020-01-06 19:14:50.81742938 +0000
@@ -31,8 +31,10 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-SCOTCH_VERSION=scotch_6.0.6
-export SCOTCH_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$SCOTCH_VERSION
+##Easybuild## settings
+export SCOTCH_VERSION="scotch_$EBVERSIONSCOTCH"
+export SCOTCH_ARCH_PATH="$EBROOTSCOTCH"
+[ -d "$SCOTCH_ARCH_PATH" ] || SCOTCH_ARCH_PATH="$SCOTCH_ROOT"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
--- OpenFOAM-v1912/etc/config.sh/vtk.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/etc/config.sh/vtk 2020-01-06 19:13:23.08425391 +0000
@@ -31,46 +31,9 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
-vtk_version=VTK-8.2.0
-mesa_version=mesa-17.1.1
-mesa_llvm=none
-
-export VTK_DIR="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$vtk_version"
-export MESA_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa_version"
-export LLVM_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH/$mesa_llvm"
+##Easybuild## settings
+export VTK_DIR="$EBROOTVTK"
+export MESA_ARCH_PATH="$EBROOTMESA"
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
-if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
-then
- echo "Using vtk" 1>&2
- echo " vtk ($vtk_version) $VTK_DIR" 1>&2
- echo " mesa ($mesa_version) $MESA_ARCH_PATH" 1>&2
- echo " llvm ($mesa_llvm) $LLVM_ARCH_PATH" 1>&2
-fi
-
-if command -v _foamAddLib > /dev/null 2>&1 # normal sourcing
-then
-
- # Set paths if binaries are present
- if [ -d "$VTK_DIR" ]
- then
- # Uses lib/ and not lib64/
- _foamAddLib "$VTK_DIR/lib"
- else
- unset VTK_DIR
- fi
-
- if [ -d "$MESA_ARCH_PATH" ]
- then
- _foamAddLibAuto "$LLVM_ARCH_PATH"
- _foamAddLibAuto "$MESA_ARCH_PATH"
- else
- unset LLVM_ARCH_PATH
- unset MESA_ARCH_PATH
- fi
-
- unset vtk_version mesa_version mesa_llvm
-fi
-
-#------------------------------------------------------------------------------
--- OpenFOAM-v1912/wmake/scripts/have_readline.orig 2020-01-06 19:07:23.000000000 +0000
+++ OpenFOAM-v1912/wmake/scripts/have_readline 2020-01-06 19:15:54.77256611 +0000
@@ -52,47 +52,52 @@
# -> HAVE_LIBREADLINE, READLINE_INC_DIR, READLINE_LIB_DIR
have_readline()
{
- local header library static settings warn
+ local prefix header library incName libName settings warn
# warn="==> skip readline"
+ # Expected location, include/library names
+ prefix="$EBROOTLIBREADLINE"
+ incName="readline/readline.h"
+ libName="libreadline"
+
+ # ----------------------------------
+ if isNone "$prefix"
+ then
+ [ -n "$warn" ] && echo "$warn (disabled)"
+ return 1
+ elif hasAbsdir "$prefix"
+ then
+ header=$(findFirstFile "$prefix/include/$incName")
+ library="$(findExtLib $libName)"
+ elif isSystem "$prefix"
+ then
+ header=$(findFirstFile "/usr/local/include/$incName" "/usr/include/$incName")
+ prefix=$(sysPrefix "$header")
+ else
+ unset prefix
+ fi
+ # ----------------------------------
- # Header/library names
- header="readline/readline.h"
- library="libreadline$extLibso"
-
- # System only?
- header=$(findFirstFile /usr/local/include/$header /usr/include/$header)
-
- case "$header" in
- /usr/local/*)
- library=$(findFirstFile \
- /usr/local/lib/$library \
- /usr/local/lib$WM_COMPILER_LIB_ARCH/$library \
- )
- ;;
-
- *)
- library=$(findFirstFile \
- /usr/lib/$library \
- /usr/lib$WM_COMPILER_LIB_ARCH/$library \
- )
- ;;
- esac
-
- # Header found?
+ # Header
[ -n "$header" ] || {
[ -n "$warn" ] && echo "$warn (no header)"
return 2
}
- # Library found?
- [ -n "$library" ] || {
- [ -n "$warn" ] && echo "$warn (missing library)"
+ # Library
+ [ -n "$library" ] || library=$(findLibrary \
+ "$prefix/lib/$libName" \
+ "$prefix/lib$WM_COMPILER_LIB_ARCH/$libName" \
+ ) || {
+ [ -n "$warn" ] && echo "$warn (no library)"
return 2
}
- header="${header%/*}" # Strip one-level (include/readline/...)
+ # ----------------------------------
+
+ header="${header%/*}" # Strip one-level (include/readline/...)
+ # OK
export HAVE_LIBREADLINE=true
export READLINE_INC_DIR="${header%/*}" # Basename
export READLINE_LIB_DIR="${library%/*}" # Basename
Golden_Repo/o/OpenFOAM/OpenFOAM-v1812-gpsmpi-2020.eb 0 → 100644
+ 68
− 0
View file @ c304cc51
name = 'OpenFOAM'
version = 'v1812'
versionsuffix = '_200312'
homepage = 'https://www.openfoam.com/'
description = """OpenFOAM is a free, open source CFD software package.
OpenFOAM has an extensive range of features to solve anything from complex fluid flows
involving chemical reactions, turbulence and heat transfer,
to solid dynamics and electromagnetics.
OpenFOAM %(version)s%(versionsuffix)s is installed in
$EBROOTOPENFOAM
and the corresponding module
OpenFOAM/%(version)s%(versionsuffix)s
provides settings to run its solvers and utilities.
The full OpenFOAM environment can be initiated via
. $FOAM_BASH
"""
toolchain = {'name': 'gpsmpi', 'version': '2020'}
toolchainopts = {'opt': True, 'cstd': 'c++17'}
source_urls = ['https://sourceforge.net/projects/openfoam/files/%(version)s/']
sources = ['%(name)s-%(version)s%(versionsuffix)s.tgz', 'ThirdParty-v1812.tgz']
patches = [
'OpenFOAM-%(version)s-cleanup.patch',
('ThirdParty-%(version)s-cleanup.patch', ".."),
# 'OpenFOAM-v1906-CGAL-4.14.1.patch',
]
checksums = [
'925d2877c12740fab177a30fdcaa8899c262c15b90225f9c29d18a2d97532de0', # OpenFOAM-v1812_200312.tgz
'f90a66d193f238528543bb4e007b43c90f246351aa9a7ea15ea8e7fe3b410498', # ThirdParty-v1812.tgz
'632c0888d476171823fbec00dd85c951897a49e86c6d44b7ae6fd010ddb4b066', # OpenFOAM-v1812-cleanup.patch
'd37f3451d5716f1b989f999f46ed74a3e625ccbac78dfbc196203498e941b172', # ThirdParty-v1812-cleanup.patch
'b986a573775fe108755790ef34529f2afd428be7c4c295fadb58fbe5ea058920', # OpenFOAM-v1906-CGAL-4.14.1.patch
]
dependencies = [
('libreadline', '8.0'),
('ncurses', '6.2'),
# OpenFOAM requires 64 bit METIS using 32 bit indexes (array indexes)
('METIS', '5.1.0'),
('SCOTCH', '6.1.0'),
('CGAL', '4.13.1', '-Python-3.8.5'),
('FFTW', '3.3.8'),
# ('ParaView', '5.6.0', '-Python-3.6.8'),
]
builddependencies = [
('Bison', '3.6.4'),
('CMake', '3.18.0'),
('flex', '2.6.4'),
]
parallel = 8
prebuildopts = 'export FOAMY_HEX_MESH=1 &&'
modextravars = {
'MPI_BUFFER_SIZE': '40000000'
}
modloadmsg = "This module provides only a minimal environment to run %(name)s executables.\n"
modloadmsg += "The full environment can be initiated via:\n"
modloadmsg += ". $FOAM_BASH\n"
moduleclass = 'cae'
Golden_Repo/o/OpenFOAM/ThirdParty-v1812-cleanup.patch 0 → 100644
+ 256
− 0
View file @ c304cc51
--- ThirdParty-v1812/Allwmake.orig 2020-08-19 14:45:23.238743000 +0200
+++ ThirdParty-v1812/Allwmake 2020-08-31 12:19:28.638081685 +0200
@@ -73,172 +73,6 @@
#------------------------------------------------------------------------------
# Building scotch on different platforms is still a bit of a pain
-
-# Get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/scotch)
-then
- . $settings
-else
- echo
- echo "Error: no config.sh/scotch settings"
- echo
-fi
-
-echo
-echo ========================================
-echo "Scotch decomposition ($SCOTCH_VERSION)"
-echo " $SCOTCH_ARCH_PATH"
-
-SCOTCH_SOURCE_DIR=$sourceBASE/$SCOTCH_VERSION
-
-# Needs generalizing, but works fairly well
-scotchMakefile=etc/makeFiles/scotch/Makefile.inc.OpenFOAM-"$(uname -s)".shlib
-
-[ -f $scotchMakefile ] || \
- scotchMakefile=${scotchMakefile%/*}/Makefile.inc.OpenFOAM-Linux.shlib
-
-if [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
- -a -r $FOAM_EXT_LIBBIN/libscotch.$SO \
- -a -r $FOAM_EXT_LIBBIN/libscotcherrexit.$SO ]
-then
- echo " scotch include: $SCOTCH_ARCH_PATH/include"
- echo " scotch library: $FOAM_EXT_LIBBIN"
-elif [ -d "$SCOTCH_SOURCE_DIR" ]
-then
-(
- # Older versions ok, but scotch-6.0.5a cannot build in parallel.
- # Force serial build
- export WM_NCOMPPROCS=1
- echo "*** building scotch in serial ***"
- echo
-
- cd $SCOTCH_SOURCE_DIR/src || exit 1
- export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo
- rm -rf $SCOTCH_ARCH_PATH
-
- applyPatch $SCOTCH_VERSION .. # patch at parent-level
-
- prefixDIR=$SCOTCH_ARCH_PATH
- incDIR=$SCOTCH_ARCH_PATH/include
- libDIR=$FOAM_EXT_LIBBIN
-
- mkdir -p $prefixDIR 2>/dev/null
- mkdir -p $incDIR 2>/dev/null
- mkdir -p $libDIR 2>/dev/null
-
- # Makefile relative to this directory
- scotchMakefile=../../$scotchMakefile
-
- if [ -f $scotchMakefile ]
- then
- rm -f Makefile.inc
- ln -s $scotchMakefile Makefile.inc
- fi
- [ -f Makefile.inc ] || {
- echo " Error: scotch needs an appropriate Makefile.inc"
- exit 1
- }
-
- export CCS="${CC:-$WM_CC}" # CCS (serial compiler) default=$(CC)
- export CCP=$(whichMpicc) # CCP (parallel compiler) default=mpicc
-
- # Consistency for Intel-MPI and non-icc compilers
- [ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
-
- make realclean 2>/dev/null # Extra safety
- make -j $WM_NCOMPPROCS scotch \
- && make \
- prefix=$prefixDIR \
- includedir=$incDIR \
- libdir=$libDIR \
- install
-
- make realclean 2>/dev/null || true # Failed cleanup is uncritical
-) || warnBuildIssues SCOTCH
-else
- warnNotFound SCOTCH
-fi
-
-# Build ptscotch if MPI (ThirdParty or system) is available
-# and normal scotch was built (has include and library)
-if [ "${FOAM_MPI:-dummy}" != dummy ] && \
- [ -f $SCOTCH_ARCH_PATH/include/scotch.h \
- -a -r $FOAM_EXT_LIBBIN/libscotch.$SO ] || \
-{
- # Report that the above tests failed and pass-through the failure
- echo
- echo " WARNING: skipping pt-scotch - no mpi or <scotch.h> not found"
- false
-}
-then
- echo
- echo ========================================
- echo "pt-scotch decomposition ($SCOTCH_VERSION with $FOAM_MPI)"
- echo " $SCOTCH_ARCH_PATH"
-
- if [ -f $SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h \
- -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotch.$SO \
- -a -r $FOAM_EXT_LIBBIN/$FOAM_MPI/libptscotcherrexit.$SO ]
- then
- echo " ptscotch include: $SCOTCH_ARCH_PATH/include/$FOAM_MPI"
- echo " ptscotch library: $FOAM_EXT_LIBBIN/$FOAM_MPI"
- else
- (
- # Older versions ok, but scotch-6.0.5a cannot build in parallel.
- # Force serial build
- export WM_NCOMPPROCS=1
- echo "*** building pt-scotch in serial ***"
-
- cd $SCOTCH_SOURCE_DIR/src || exit 1
- export GIT_DIR=$SCOTCH_SOURCE_DIR/.git # Mask seeing our own git-repo
- echo
-
- prefixDIR=$SCOTCH_ARCH_PATH
- incDIR=$SCOTCH_ARCH_PATH/include/$FOAM_MPI
- libDIR=$FOAM_EXT_LIBBIN/$FOAM_MPI
-
- mkdir -p $prefixDIR 2>/dev/null
- mkdir -p $incDIR 2>/dev/null
- mkdir -p $libDIR 2>/dev/null
-
- if [ -f $scotchMakefile ]
- then
- rm -f Makefile.inc
- ln -s $scotchMakefile Makefile.inc
- fi
- [ -f Makefile.inc ] || {
- echo " Error: ptscotch needs an appropriate Makefile.inc"
- exit 1
- }
-
- export CCS="${CC:-$WM_CC}" # CCS (serial compiler) default=$(CC)
- export CCP=$(whichMpicc) # CCP (parallel compiler) default=mpicc
-
- # Consistency for Intel-MPI and non-icc compilers
- [ -n "$I_MPI_CC" ] || export I_MPI_CC="${CC:-$WM_CC}"
-
- make realclean 2>/dev/null # Extra safety
- make -j $WM_NCOMPPROCS ptscotch \
- && make \
- prefix=$prefixDIR \
- includedir=$incDIR \
- libdir=$libDIR \
- install
-
- make realclean 2>/dev/null || true # Failed cleanup is uncritical
- ) || warnBuildIssues PTSCOTCH
- fi
-
- # Verify existence of ptscotch include
- [ -f $SCOTCH_ARCH_PATH/include/$FOAM_MPI/ptscotch.h ] || {
- echo
- echo " WARNING: required include file 'ptscotch.h' not found!"
- }
-fi
-
-# Could now remove $SCOTCH_SOURCE_DIR/src/Makefile.inc
-
-
#------------------------------------------------------------------------------
echo
@@ -258,45 +92,44 @@
fi
#------------------------------------------------------------------------------
-echo
-echo ========================================
-
+#echo
+#echo ========================================
# Get METIS_ARCH_PATH
-if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis)
-then
- . $settings
-fi
-if [ -n "$METIS_ARCH_PATH" ]
-then
- echo Metis decomposition
- ./makeMETIS -test "$METIS_ARCH_PATH" || \
- ./makeMETIS || warnBuildIssues METIS
-else
- warnNotFound METIS # METIS is optional
-fi
+#if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/metis)
+#then
+# . $settings
+#fi
+#if [ -n "$METIS_ARCH_PATH" ]
+#then
+# echo Metis decomposition
+# ./makeMETIS -test "$METIS_ARCH_PATH" || \
+# ./makeMETIS || warnBuildIssues METIS
+#else
+# warnNotFound METIS # METIS is optional
+#fi
#------------------------------------------------------------------------------
-echo
-echo ========================================
-if [ -n "$CGAL_ARCH_PATH" ]
-then
- echo "CGAL/boost"
- ./makeCGAL -test "$CGAL_ARCH_PATH" "$BOOST_ARCH_PATH" || \
- ./makeCGAL || warnBuildIssues CGAL
-else
- warnNotFound CGAL # CGAL is optional
-fi
-
-echo
-echo ========================================
-if [ -n "$FFTW_ARCH_PATH" ]
-then
- echo FFTW
- ./makeFFTW -test "$FFTW_ARCH_PATH" || \
- ./makeFFTW || warnBuildIssues FFTW
-else
- warnNotFound FFTW # FFTW is optional
-fi
+#echo
+#echo ========================================
+#if [ -n "$CGAL_ARCH_PATH" ]
+#then
+# echo "CGAL/boost"
+# ./makeCGAL -test "$CGAL_ARCH_PATH" "$BOOST_ARCH_PATH" || \
+# ./makeCGAL || warnBuildIssues CGAL
+#else
+# warnNotFound CGAL # CGAL is optional
+#fi
+
+#echo
+#echo ========================================
+#if [ -n "$FFTW_ARCH_PATH" ]
+#then
+# echo FFTW
+# ./makeFFTW -test "$FFTW_ARCH_PATH" || \
+# ./makeFFTW || warnBuildIssues FFTW
+#else
+# warnNotFound FFTW # FFTW is optional
+#fi
echo
echo ========================================
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment