fe17c8ad5f
- missed detection of system libraries when installed with multiarch paths like /usr/lib/x86_64-linux-gnu CONFIG: improve handling of group/user config files (#928) - changed bashrc handling of FOAM_CONFIG_NOUSER to use FOAM_CONFIG_MODE instead. Propagate into foamEtcFile to make this a stickier control. This change allows better control, but also enables cluster installations to define their own value within the OpenFOAM prefs.sh file to prevent users accidentally mis-configuring things if necessary. - remove undocumented handling of an (a)ll mode in foamEtcFile to avoid potential pitfalls. - add support for FOAM_CONFIG_ETC handling. This allows injection of an extra search layer when finding project etc files ENH: improvements to foamConfigurePaths (#928) - handle FOAM_CONFIG_ETC implicitly, or explicitly with the new -etc option. STYLE: more explicit wording in foamConfigurePaths usage (#1602) - document that an absolute path (eg, -scotch-path) overrides/ignores the equivalent ThirdParty setting (eg, -scotch) - longer options -system-compiler and -third-compiler for -system and -third, respectively. Clearer as to their purpose. - adjust the location sanity check to look for META-INFO directory.
177 lines
4.4 KiB
Bash
177 lines
4.4 KiB
Bash
#----------------------------------*-sh-*--------------------------------------
|
|
# ========= |
|
|
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
# \\ / O peration |
|
|
# \\ / A nd | www.openfoam.com
|
|
# \\/ M anipulation |
|
|
#------------------------------------------------------------------------------
|
|
# Copyright (C) 2018-2019 OpenCFD Ltd.
|
|
#------------------------------------------------------------------------------
|
|
# License
|
|
# This file is part of OpenFOAM, licensed under GNU General Public License
|
|
# <http://www.gnu.org/licenses/>.
|
|
#
|
|
# Script
|
|
# have_mgridgen
|
|
#
|
|
# Description
|
|
# Detection/setup of mgridgen
|
|
#
|
|
# Requires
|
|
# config.sh/mgridgen
|
|
#
|
|
# Functions provided
|
|
# have_mgridgen, no_mgridgen, echo_mgridgen
|
|
#
|
|
# Variables set on success
|
|
# HAVE_MGRIDGEN
|
|
# MGRIDGEN_ARCH_PATH
|
|
# MGRIDGEN_INC_DIR
|
|
# MGRIDGEN_LIB_DIR
|
|
#
|
|
#------------------------------------------------------------------------------
|
|
. ${WM_PROJECT_DIR:?}/wmake/scripts/sysFunctions # General system functions
|
|
|
|
#------------------------------------------------------------------------------
|
|
|
|
# Reset variables
|
|
no_mgridgen()
|
|
{
|
|
unset HAVE_MGRIDGEN MGRIDGEN_ARCH_PATH MGRIDGEN_INC_DIR MGRIDGEN_LIB_DIR
|
|
unset MGRIDGEN_VERSION
|
|
return 0
|
|
}
|
|
|
|
|
|
# Report
|
|
echo_mgridgen()
|
|
{
|
|
echo "mgridgen=${HAVE_MGRIDGEN:-false}"
|
|
echo "root=$MGRIDGEN_ARCH_PATH"
|
|
echo "include=$MGRIDGEN_INC_DIR"
|
|
echo "library=$MGRIDGEN_LIB_DIR"
|
|
}
|
|
|
|
|
|
# On success, return 0 and export variables
|
|
# -> HAVE_MGRIDGEN, MGRIDGEN_ARCH_PATH, MGRIDGEN_INC_DIR, MGRIDGEN_LIB_DIR
|
|
have_mgridgen()
|
|
{
|
|
local prefix header library incName libName libName2 settings warn
|
|
warn="==> skip mgridgen"
|
|
|
|
# Setup
|
|
if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/mgridgen)
|
|
then
|
|
. "$settings"
|
|
else
|
|
#silent# [ -n "$warn" ] && echo "$warn (no config.sh/mgridgen settings)"
|
|
return 2
|
|
fi
|
|
|
|
# Expected location, include/library names
|
|
prefix="$MGRIDGEN_ARCH_PATH"
|
|
incName="mgridgen.h"
|
|
libName="libMGridGen"
|
|
libName2="libmgrid"
|
|
|
|
# ----------------------------------
|
|
if isNone "$prefix"
|
|
then
|
|
#silent# [ -n "$warn" ] && echo "$warn (disabled)"
|
|
return 1
|
|
elif hasAbsdir "$prefix"
|
|
then
|
|
header=$(findFirstFile "$prefix/include/$incName")
|
|
library=$(findExtLib "$libName" "$libName2")
|
|
elif isSystem "$prefix"
|
|
then
|
|
header=$(findSystemInclude -name="$incName")
|
|
prefix=$(sysPrefix "$header")
|
|
else
|
|
unset prefix
|
|
fi
|
|
# ----------------------------------
|
|
|
|
# Header
|
|
[ -n "$header" ] || {
|
|
#silent# [ -n "$warn" ] && echo "$warn (no header)"
|
|
return 2
|
|
}
|
|
|
|
# Library
|
|
[ -n "$library" ] \
|
|
|| library=$(findLibrary -prefix="$prefix" -name="$libName") \
|
|
|| library=$(findLibrary -prefix="$prefix" -name="$libName2") \
|
|
|| {
|
|
#silent# [ -n "$warn" ] && echo "$warn (no library)"
|
|
return 2
|
|
}
|
|
|
|
# ----------------------------------
|
|
|
|
local good label scalar
|
|
|
|
# Ensure consistent sizes with OpenFOAM and mgridgen header
|
|
# Extract typedef for idxtype, realtype
|
|
label=$(sed -ne \
|
|
's/^.*typedef *\([^ ]*\) *idxtype.*/\1/ip' \
|
|
"$header")
|
|
scalar=$(sed -ne \
|
|
's/^.*typedef *\([^ ]*\) *realtype.*/\1/ip' \
|
|
"$header")
|
|
|
|
: "${label:=unknown}"
|
|
: "${scalar:=unknown}"
|
|
|
|
case "$WM_LABEL_SIZE:$label" in
|
|
(32:int32_t | 32:int | 64:int64_t | 64:long)
|
|
good=true
|
|
;;
|
|
|
|
(*)
|
|
if [ -n "$warn" ]
|
|
then
|
|
echo "$warn (label='$WM_LABEL_SIZE', ${header##*/} has '$label')"
|
|
fi
|
|
no_mgridgen
|
|
return 1
|
|
;;
|
|
esac
|
|
case "$WM_PRECISION_OPTION:$scalar" in
|
|
(SP:float | SPDP:float | DP:double)
|
|
good=true
|
|
;;
|
|
|
|
(*)
|
|
if [ -n "$warn" ]
|
|
then
|
|
echo "$warn (scalar='$WM_PRECISION_OPTION', ${header##*/} has '$scalar')"
|
|
fi
|
|
no_mgridgen
|
|
return 1
|
|
;;
|
|
esac
|
|
|
|
# OK
|
|
echo "mgridgen (label=$label, scalar=$scalar) - $prefix"
|
|
export HAVE_MGRIDGEN=true
|
|
export MGRIDGEN_ARCH_PATH="$prefix"
|
|
export MGRIDGEN_INC_DIR="${header%/*}" # Basename
|
|
export MGRIDGEN_LIB_DIR="${library%/*}" # Basename
|
|
export MGRIDGEN_VERSION
|
|
}
|
|
|
|
|
|
# Reset variables
|
|
no_mgridgen
|
|
|
|
# Testing
|
|
if [ "$1" = "-test" ]
|
|
then
|
|
have_mgridgen
|
|
echo_mgridgen
|
|
fi
|
|
|
|
#------------------------------------------------------------------------------
|