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

ENH: add edit for ADIOS2 settings in foamConfigurePaths

Browse Source 
CONFIG: remove adios1 config files
This commit is contained in:
Mark Olesen
2019-08-16 09:17:18 +02:00
committed by Andrew Heather
parent edbb6a122b
commit c072000dca
3 changed files with 20 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/tools/foamConfigurePaths
View File

@ -51,6 +51,8 @@ MPI
-openmpi-third use ThirdParty openmpi (using default version)
Components
-adios VER specify 'adios2_version'
-adios-path DIR specify 'ADIOS2_ARCH_PATH'
-boost VER specify 'boost_version'
-boost-path DIR specify 'BOOST_ARCH_PATH'
-cgal ver specify 'cgal_version'
@ -464,6 +466,24 @@ do
## Components ##
-adios | -adios2)
# Replace adios2_version=...
optionValue=$(getOptionValue "$@")
replace etc/config.sh/adios2 adios2_version "$optionValue"
replace etc/config.csh/adios2 adios2_version "$optionValue"
adjusted=true
shift
;;
-adios-path | -adios2-path)
# Replace ADIOS2_ARCH_PATH=...
optionValue=$(getOptionValue "$@")
replace etc/config.sh/adios2 ADIOS2_ARCH_PATH "\"$optionValue\""
replaceCsh etc/config.csh/adios2 ADIOS2_ARCH_PATH "\"$optionValue\""
adjusted=true
shift
;;
-boost)
# Replace boost_version=...
optionValue=$(getOptionValue "$@")

53
etc/config.csh/adios1
View File

@ -1,53 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 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/adios1
# - sourced by OpenFOAM-*/etc/cshrc
#
# Description
# Setup for ADIOS include/libraries (usually ThirdParty installation).
#
# To disable its use: adios1_version=adios-none
# For system-wide installations: adios1_version=adios-system
#
# For central installations not located under ThirdParty:
# 1. use adios-system
# 2. and provide full path for ADIOS1_ARCH_PATH
#
# Note
# 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 adios1_version=ADIOS-1.13.1
setenv ADIOS1_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios1_version
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using adios ($adios1_version) -> $ADIOS1_ARCH_PATH"
endif
# Only add to PATH if the directory really exists
_foamAddLibAuto $ADIOS1_ARCH_PATH
if ($status == 0) then
_foamAddPath $ADIOS1_ARCH_PATH/bin
endif
unset adios1_version
#------------------------------------------------------------------------------

70
etc/config.sh/adios1
View File

@ -1,70 +0,0 @@
#----------------------------------*-sh-*--------------------------------------
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
# \\ / A nd | Copyright (C) 2016-2019 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/adios1
# - sourced by OpenFOAM-*/etc/bashrc
#
# Description
# Setup for ADIOS include/libraries (usually ThirdParty installation).
#
# To disable its use: adios1_version=adios-none
# For system-wide installations: adios1_version=adios-system
#
# For central installations not located under ThirdParty:
# 1. use adios-system
# 2. and provide full path for ADIOS1_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
adios1_version=ADIOS-1.13.1
export ADIOS1_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios1_version
# END OF (NORMAL) USER EDITABLE PART
#------------------------------------------------------------------------------
if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
then
echo "Using adios ($adios1_version) -> $ADIOS1_ARCH_PATH" 1>&2
fi
if command -v _foamAddLibAuto > /dev/null 2>&1
then
# Normal sourcing (not makeAdios1)
# Only add to PATH if the directory really exists
if _foamAddLibAuto $ADIOS1_ARCH_PATH
then
_foamAddPath $ADIOS1_ARCH_PATH/bin
fi
unset adios1_version
elif [ "$1" = "-force" ]
then
# Forced command-line sourcing
if output="$($WM_PROJECT_DIR/bin/tools/lib-dir -sh $ADIOS1_ARCH_PATH 2>/dev/null)"
then
eval "$output"
PATH="$ADIOS1_ARCH_PATH/bin:$PATH"
fi
unset adios1_version output
fi
#------------------------------------------------------------------------------