zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIG: add sourcing hints for adios2, petsc

Browse Source
This commit is contained in:
Mark Olesen
2019-08-02 12:17:39 +02:00
committed by Andrew Heather
parent 89bc42ddcb
commit e400725675
7 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/config.csh/adios1
View File

@ -42,7 +42,7 @@ if ($?FOAM_VERBOSE && $?prompt) then
echo "Using adios ($adios1_version) -> $ADIOS1_ARCH_PATH" echo "Using adios ($adios1_version) -> $ADIOS1_ARCH_PATH"
endif endif
# - only add if the directory really exists # Only add to PATH if the directory really exists
_foamAddLibAuto $ADIOS1_ARCH_PATH _foamAddLibAuto $ADIOS1_ARCH_PATH
if ($status == 0) then if ($status == 0) then
_foamAddPath $ADIOS1_ARCH_PATH/bin _foamAddPath $ADIOS1_ARCH_PATH/bin

2
etc/config.csh/adios2
View File

@ -28,7 +28,7 @@ if ($?FOAM_VERBOSE && $?prompt) then
echo "Using adios ($adios2_version) -> $ADIOS2_ARCH_PATH" echo "Using adios ($adios2_version) -> $ADIOS2_ARCH_PATH"
endif endif
# - only add if the directory really exists # Only add to PATH if the directory really exists
_foamAddLibAuto $ADIOS2_ARCH_PATH _foamAddLibAuto $ADIOS2_ARCH_PATH
if ($status == 0) then if ($status == 0) then
_foamAddPath $ADIOS2_ARCH_PATH/bin _foamAddPath $ADIOS2_ARCH_PATH/bin

4
etc/config.sh/adios1
View File

@ -44,8 +44,8 @@ fi
if command -v _foamAddLibAuto > /dev/null 2>&1 if command -v _foamAddLibAuto > /dev/null 2>&1
then then
# Normal sourcing (not makeADIOS) # Normal sourcing (not makeAdios1)
# - but only add if the directory really exists # Only add to PATH if the directory really exists
if _foamAddLibAuto $ADIOS1_ARCH_PATH if _foamAddLibAuto $ADIOS1_ARCH_PATH
then then

4
etc/config.sh/adios2
View File

@ -32,8 +32,8 @@ fi
if command -v _foamAddLibAuto > /dev/null 2>&1 if command -v _foamAddLibAuto > /dev/null 2>&1
then then
# Normal sourcing (not makeADIOS) # Normal sourcing (not makeAdios2)
# - but only add if the directory really exists # Only add to PATH if the directory really exists
if _foamAddLibAuto $ADIOS2_ARCH_PATH if _foamAddLibAuto $ADIOS2_ARCH_PATH
then then

3
etc/config.sh/petsc
View File

@ -36,8 +36,9 @@ then
echo "Using petsc ($petsc_version) -> $PETSC_ARCH_PATH" 1>&2 echo "Using petsc ($petsc_version) -> $PETSC_ARCH_PATH" 1>&2
fi fi
if command -v _foamAddLibAuto > /dev/null 2>&1 # Normal sourcing (not makePETSC) if command -v _foamAddLibAuto > /dev/null 2>&1
then then
# Normal sourcing (not makePETSC)
_foamAddLibAuto $PETSC_ARCH_PATH _foamAddLibAuto $PETSC_ARCH_PATH

18
wmake/scripts/have_adios2
View File

@ -19,7 +19,7 @@
# ADIOS2_ARCH_PATH # ADIOS2_ARCH_PATH
# #
# Functions provided # Functions provided
# have_adios2, no_adios2, echo_adios2 # have_adios2, no_adios2, echo_adios2, hint_adios2
# #
# Variables set on success # Variables set on success
# HAVE_ADIOS2 # HAVE_ADIOS2
@ -50,6 +50,22 @@ echo_adios2()
} }
# Provide hint for enabling
hint_adios2()
{
/bin/cat<<INFORMATION 1>&2
==> adios2 not found?
Enable in the OpenFOAM etc/bashrc, define manually or try with the
following (POSIX shell):
eval \$(foamEtcFile -sh -config adios2 -- -force)
==
INFORMATION
}
# On success, return 0 and export variables # On success, return 0 and export variables
# -> HAVE_ADIOS2, ADIOS2_INC_DIR, ADIOS2_LIB_DIR # -> HAVE_ADIOS2, ADIOS2_INC_DIR, ADIOS2_LIB_DIR
have_adios2() have_adios2()

18
wmake/scripts/have_petsc
View File

@ -19,7 +19,7 @@
# PETSC_ARCH_PATH # PETSC_ARCH_PATH
# #
# Functions provided # Functions provided
# have_petsc, no_petsc, echo_petsc # have_petsc, no_petsc, echo_petsc, hint_petsc
# #
# Variables set on success # Variables set on success
# HAVE_PETSC # HAVE_PETSC
@ -50,6 +50,22 @@ echo_petsc()
} }
# Provide hint for enabling
hint_petsc()
{
/bin/cat<<INFORMATION 1>&2
==> petsc not found?
Enable in the OpenFOAM etc/bashrc, define manually or try with the
following (POSIX shell):
eval \$(foamEtcFile -sh -config petsc -- -force)
==
INFORMATION
}
# On success, return 0 and export variables # On success, return 0 and export variables
# -> HAVE_PETSC, PETSC_INC_DIR, PETSC_LIB_DIR # -> HAVE_PETSC, PETSC_INC_DIR, PETSC_LIB_DIR
have_petsc() have_petsc()