Commit 2fc1a169 authored by Mark Olesen's avatar Mark Olesen
Browse files

CONFIG: adjust handling of PETSc environment (-force option)

parent f5baa9a5
......@@ -43,6 +43,16 @@ then
unset petsc_version
elif [ "$1" = "-force" ]
then
# Forced command-line sourcing
if output="$($WM_PROJECT_DIR/bin/tools/lib-dir -sh $PETSC_ARCH_PATH 2>/dev/null)"
then
eval "$output"
fi
unset petsc_version output
fi
#------------------------------------------------------------------------------
......@@ -55,9 +55,17 @@ echo_petsc()
have_petsc()
{
local header library static label settings warn
# warn="==> skip petsc"
warn="==> skip petsc"
# Basic setup/checks
# Basic setup/checks. Prefer current environment value? (TDB)
if [ ! -d "$PETSC_ARCH_PATH" ]
then
settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/petsc) || {
[ -n "$warn" ] && echo "$warn (no config.sh/petsc settings)"
return 1
}
. $settings
fi
if isNone "$PETSC_ARCH_PATH"
then
[ -n "$warn" ] && echo "$warn (not available)"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment