mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-12-28 03:37:59 +00:00
Merge branch 'master' into cvm
This commit is contained in:
graham
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# aliases.csh
|
||||
# etc/aliases.csh
|
||||
#
|
||||
# Description
|
||||
# Aliases for working with OpenFOAM
|
||||
@ -38,6 +38,9 @@ alias wm32 'wmSET WM_ARCH_OPTION=32'
|
||||
alias wmSP 'wmSET WM_PRECISION_OPTION=SP'
|
||||
alias wmDP 'wmSET WM_PRECISION_OPTION=DP'
|
||||
|
||||
# clear env
|
||||
alias wmUNSET='source $WM_PROJECT_DIR/etc/unset.csh'
|
||||
|
||||
# Toggle wmakeScheduler on/off
|
||||
# - also need to set WM_HOSTS
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# aliases.sh
|
||||
# etc/aliases.sh
|
||||
#
|
||||
# Description
|
||||
# Aliases for working with OpenFOAM
|
||||
@ -38,6 +38,9 @@ alias wm32='wmSET WM_ARCH_OPTION=32'
|
||||
alias wmSP='wmSET WM_PRECISION_OPTION=SP'
|
||||
alias wmDP='wmSET WM_PRECISION_OPTION=DP'
|
||||
|
||||
# clear env
|
||||
alias wmUNSET='. $WM_PROJECT_DIR/etc/unset.sh'
|
||||
|
||||
# Toggle wmakeScheduler on/off
|
||||
# - also need to set WM_HOSTS
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
@ -101,7 +101,7 @@ export FOAM_SIGFPE=
|
||||
# The old dirs to be cleaned from the various environment variables
|
||||
# - remove anything under top-level directory.
|
||||
# NB: the WM_PROJECT_INST_DIR might not be identical between versions
|
||||
foamOldDirs="$FOAM_INST_DIR $HOME/$WM_PROJECT/$USER"
|
||||
foamOldDirs="$FOAM_INST_DIR $WM_PROJECT_SITE $HOME/$WM_PROJECT/$USER"
|
||||
if [ "$WM_PROJECT_INST_DIR" != "$FOAM_INST_DIR" ]
|
||||
then
|
||||
foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs"
|
||||
|
||||
@ -107,6 +107,9 @@ if ( $?WM_PROJECT_INST_DIR ) then
|
||||
set foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs"
|
||||
endif
|
||||
endif
|
||||
if ( $?WM_PROJECT_SITE ) then
|
||||
set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
|
||||
endif
|
||||
|
||||
|
||||
# Location of installation
|
||||
|
||||
@ -168,7 +168,6 @@ setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib
|
||||
|
||||
# convenience
|
||||
setenv FOAM_APP $WM_PROJECT_DIR/applications
|
||||
#setenv FOAM_LIB $WM_PROJECT_DIR/lib
|
||||
setenv FOAM_SRC $WM_PROJECT_DIR/src
|
||||
setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
|
||||
setenv FOAM_UTILITIES $FOAM_APP/utilities
|
||||
@ -361,8 +360,8 @@ unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
|
||||
|
||||
switch ("$WM_MPLIB")
|
||||
case OPENMPI:
|
||||
#setenv FOAM_MPI openmpi-1.4.1
|
||||
setenv FOAM_MPI openmpi-1.5.1
|
||||
#setenv FOAM_MPI openmpi-1.4.3
|
||||
setenv FOAM_MPI openmpi-1.5.3
|
||||
setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
|
||||
|
||||
# Tell OpenMPI where to find its install directory
|
||||
|
||||
@ -190,7 +190,6 @@ export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib
|
||||
|
||||
# convenience
|
||||
export FOAM_APP=$WM_PROJECT_DIR/applications
|
||||
#export FOAM_LIB=$WM_PROJECT_DIR/lib
|
||||
export FOAM_SRC=$WM_PROJECT_DIR/src
|
||||
export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
|
||||
export FOAM_UTILITIES=$FOAM_APP/utilities
|
||||
@ -382,8 +381,8 @@ unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
|
||||
|
||||
case "$WM_MPLIB" in
|
||||
OPENMPI)
|
||||
#export FOAM_MPI=openmpi-1.4.1
|
||||
export FOAM_MPI=openmpi-1.5.1
|
||||
#export FOAM_MPI=openmpi-1.4.3
|
||||
export FOAM_MPI=openmpi-1.5.3
|
||||
export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
|
||||
|
||||
# Tell OpenMPI where to find its install directory
|
||||
|
||||
193
etc/unset.csh
Normal file
193
etc/unset.csh
Normal file
@ -0,0 +1,193 @@
|
||||
#----------------------------------*-sh-*--------------------------------------
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM.
|
||||
#
|
||||
# OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/unset.csh
|
||||
#
|
||||
# Description
|
||||
# Clear as many OpenFOAM environment settings as possible
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH)
|
||||
|
||||
unset foamClean
|
||||
if ( $?WM_PROJECT_DIR ) then
|
||||
set foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
|
||||
if ( ! -f "$foamClean" || ! -x "$foamClean" ) unset foamClean
|
||||
endif
|
||||
|
||||
set foamOldDirs=""
|
||||
|
||||
# The old dirs to be cleaned from the various environment variables
|
||||
# - remove anything under top-level directory.
|
||||
# NB: the WM_PROJECT_INST_DIR might not be identical between versions
|
||||
#
|
||||
if ( $?WM_PROJECT_INST_DIR ) then
|
||||
set foamOldDirs="$WM_PROJECT_INST_DIR"
|
||||
endif
|
||||
|
||||
if ( $?WM_PROJECT ) then
|
||||
set foamOldDirs="$HOME/$WM_PROJECT/$LOGNAME $foamOldDirs"
|
||||
endif
|
||||
|
||||
if ( $?WM_PROJECT_SITE ) then
|
||||
set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
|
||||
endif
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset WM_* environment variables
|
||||
|
||||
unsetenv WM_ARCH
|
||||
unsetenv WM_ARCH_OPTION
|
||||
unsetenv WM_CC
|
||||
unsetenv WM_CFLAGS
|
||||
unsetenv WM_COMPILER
|
||||
unsetenv WM_COMPILER_LIB_ARCH
|
||||
unsetenv WM_COMPILE_OPTION
|
||||
unsetenv WM_CXX
|
||||
unsetenv WM_CXXFLAGS
|
||||
unsetenv WM_DIR
|
||||
unsetenv WM_HOSTS
|
||||
unsetenv WM_LDFLAGS
|
||||
unsetenv WM_LINK_LANGUAGE
|
||||
unsetenv WM_MPLIB
|
||||
unsetenv WM_NCOMPPROCS
|
||||
unsetenv WM_OPTIONS
|
||||
unsetenv WM_OSTYPE
|
||||
unsetenv WM_PRECISION_OPTION
|
||||
unsetenv WM_PROJECT
|
||||
unsetenv WM_PROJECT_DIR
|
||||
unsetenv WM_PROJECT_INST_DIR
|
||||
unsetenv WM_PROJECT_SITE
|
||||
unsetenv WM_PROJECT_USER_DIR
|
||||
unsetenv WM_PROJECT_VERSION
|
||||
unsetenv WM_SCHEDULER
|
||||
unsetenv WM_THIRD_PARTY_DIR
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset FOAM_* environment variables
|
||||
|
||||
unsetenv FOAM_APPBIN
|
||||
unsetenv FOAM_APP
|
||||
unsetenv FOAM_EXT_LIBBIN
|
||||
unsetenv FOAM_CODE_TEMPLATES
|
||||
unsetenv FOAM_INST_DIR
|
||||
unsetenv FOAM_JOB_DIR
|
||||
unsetenv FOAM_LIBBIN
|
||||
unsetenv FOAM_MPI
|
||||
unsetenv FOAM_RUN
|
||||
unsetenv FOAM_SETTINGS
|
||||
unsetenv FOAM_SIGFPE
|
||||
unsetenv FOAM_SIGNAN
|
||||
unsetenv FOAM_SITE_APPBIN
|
||||
unsetenv FOAM_SITE_LIBBIN
|
||||
unsetenv FOAM_SOLVERS
|
||||
unsetenv FOAM_SRC
|
||||
unsetenv FOAM_TUTORIALS
|
||||
unsetenv FOAM_USER_APPBIN
|
||||
unsetenv FOAM_USER_LIBBIN
|
||||
unsetenv FOAM_UTILITIES
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset MPI-related environment variables
|
||||
|
||||
unsetenv MPI_ARCH_PATH
|
||||
unsetenv MPI_BUFFER_SIZE
|
||||
unsetenv OPAL_PREFIX
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset Ensight/ParaView-related environment variables
|
||||
|
||||
unsetenv ENSIGHT9_READER
|
||||
unsetenv CMAKE_HOME
|
||||
unsetenv ParaView_DIR
|
||||
unsetenv PV_PLUGIN_PATH
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# cleanup environment
|
||||
# PATH, LD_LIBRARY_PATH, MANPATH
|
||||
|
||||
if ( $?foamClean ) then
|
||||
|
||||
set cleaned=`$foamClean "$PATH" "$foamOldDirs"`
|
||||
if ( $status == 0 ) setenv PATH $cleaned
|
||||
|
||||
if ($?LD_LIBRARY_PATH) then
|
||||
set cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"`
|
||||
if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
|
||||
|
||||
if ( ${%LD_LIBRARY_PATH} == 0 ) unsetenv LD_LIBRARY_PATH
|
||||
endif
|
||||
|
||||
if ($?MANPATH) then
|
||||
set cleaned=`$foamClean "$MANPATH" "$foamOldDirs"`
|
||||
if ( $status == 0 ) setenv MANPATH $cleaned
|
||||
|
||||
if ( ${%MANPATH} == 0 ) unsetenv MANPATH
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
|
||||
unset cleaned foamClean foamOldDirs
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# cleanup aliases
|
||||
|
||||
unalias wmSET
|
||||
unalias wm64
|
||||
unalias wm32
|
||||
unalias wmSP
|
||||
unalias wmDP
|
||||
|
||||
unalias wmUNSET
|
||||
|
||||
unalias wmSchedON
|
||||
unalias wmSchedOFF
|
||||
unalias foamPV
|
||||
|
||||
unalias src
|
||||
unalias lib
|
||||
unalias run
|
||||
unalias foam
|
||||
unalias foamsrc
|
||||
unalias foamfv
|
||||
unalias app
|
||||
unalias util
|
||||
unalias sol
|
||||
unalias tut
|
||||
|
||||
unalias foamApps
|
||||
unalias foamSol
|
||||
unalias foamTuts
|
||||
unalias foamUtils
|
||||
unalias foam3rdParty
|
||||
unalias foamSite
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
172
etc/unset.sh
Normal file
172
etc/unset.sh
Normal file
@ -0,0 +1,172 @@
|
||||
#----------------------------------*-sh-*--------------------------------------
|
||||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd.
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
# This file is part of OpenFOAM.
|
||||
#
|
||||
# OpenFOAM is free software: you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
# File
|
||||
# etc/unset.sh
|
||||
#
|
||||
# Description
|
||||
# Clear as many OpenFOAM environment settings as possible
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH)
|
||||
foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
|
||||
[ -f "$foamClean" -a -x "$foamClean" ] || unset foamClean
|
||||
|
||||
# The old dirs to be cleaned from the various environment variables
|
||||
# - remove anything under top-level directory.
|
||||
# NB: the WM_PROJECT_INST_DIR might not be identical between versions
|
||||
#
|
||||
foamOldDirs="$WM_PROJECT_INST_DIR $WM_PROJECT_SITE"
|
||||
if [ -n "$WM_PROJECT" ]
|
||||
then
|
||||
foamOldDirs="$foamOldDirs $HOME/$WM_PROJECT/$USER_SITE"
|
||||
fi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset WM_* environment variables
|
||||
|
||||
unset WM_ARCH
|
||||
unset WM_ARCH_OPTION
|
||||
unset WM_CC
|
||||
unset WM_CFLAGS
|
||||
unset WM_COMPILER
|
||||
unset WM_COMPILER_LIB_ARCH
|
||||
unset WM_COMPILE_OPTION
|
||||
unset WM_CXX
|
||||
unset WM_CXXFLAGS
|
||||
unset WM_DIR
|
||||
unset WM_HOSTS
|
||||
unset WM_LDFLAGS
|
||||
unset WM_LINK_LANGUAGE
|
||||
unset WM_MPLIB
|
||||
unset WM_NCOMPPROCS
|
||||
unset WM_OPTIONS
|
||||
unset WM_OSTYPE
|
||||
unset WM_PRECISION_OPTION
|
||||
unset WM_PROJECT
|
||||
unset WM_PROJECT_DIR
|
||||
unset WM_PROJECT_INST_DIR
|
||||
unset WM_PROJECT_SITE
|
||||
unset WM_PROJECT_USER_DIR
|
||||
unset WM_PROJECT_VERSION
|
||||
unset WM_SCHEDULER
|
||||
unset WM_THIRD_PARTY_DIR
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset FOAM_* environment variables
|
||||
|
||||
unset FOAM_APPBIN
|
||||
unset FOAM_APP
|
||||
unset FOAM_EXT_LIBBIN
|
||||
unset FOAM_CODE_TEMPLATES
|
||||
unset FOAM_INST_DIR
|
||||
unset FOAM_JOB_DIR
|
||||
unset FOAM_LIBBIN
|
||||
unset FOAM_MPI
|
||||
unset FOAM_RUN
|
||||
unset FOAM_SETTINGS
|
||||
unset FOAM_SIGFPE
|
||||
unset FOAM_SIGNAN
|
||||
unset FOAM_SITE_APPBIN
|
||||
unset FOAM_SITE_LIBBIN
|
||||
unset FOAM_SOLVERS
|
||||
unset FOAM_SRC
|
||||
unset FOAM_TUTORIALS
|
||||
unset FOAM_USER_APPBIN
|
||||
unset FOAM_USER_LIBBIN
|
||||
unset FOAM_UTILITIES
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset MPI-related environment variables
|
||||
|
||||
unset MPI_ARCH_PATH
|
||||
unset MPI_BUFFER_SIZE
|
||||
unset OPAL_PREFIX
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# unset Ensight/ParaView-related environment variables
|
||||
|
||||
unset ENSIGHT9_READER
|
||||
unset CMAKE_HOME
|
||||
unset ParaView_DIR
|
||||
unset PV_PLUGIN_PATH
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# cleanup environment
|
||||
# PATH, LD_LIBRARY_PATH, MANPATH
|
||||
|
||||
if [ -n "$foamClean" ]
|
||||
then
|
||||
cleaned=`$foamClean "$PATH" "$foamOldDirs"` && PATH="$cleaned"
|
||||
cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleaned"
|
||||
cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
|
||||
fi
|
||||
|
||||
|
||||
[ -n "$LD_LIBRARY_PATH" ] || unset LD_LIBRARY_PATH
|
||||
[ -n "$MANPATH" ] || unset MANPATH
|
||||
[ -n "$LD_PRELOAD" ] || unset LD_PRELOAD
|
||||
|
||||
|
||||
unset cleaned foamClean foamOldDirs
|
||||
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# cleanup aliases
|
||||
|
||||
unalias wmSET
|
||||
unalias wm64
|
||||
unalias wm32
|
||||
unalias wmSP
|
||||
unalias wmDP
|
||||
|
||||
unalias wmUNSET
|
||||
|
||||
unalias wmSchedON
|
||||
unalias wmSchedOFF
|
||||
unset foamPV
|
||||
|
||||
unalias src
|
||||
unalias lib
|
||||
unalias run
|
||||
unalias foam
|
||||
unalias foamsrc
|
||||
unalias foamfv
|
||||
unalias app
|
||||
unalias util
|
||||
unalias sol
|
||||
unalias tut
|
||||
|
||||
unalias foamApps
|
||||
unalias foamSol
|
||||
unalias foamTuts
|
||||
unalias foamUtils
|
||||
unalias foam3rdParty
|
||||
unalias foamSite
|
||||
|
||||
|
||||
# ----------------------------------------------------------------- end-of-file
|
||||
Reference in New Issue
Block a user