songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

etc/config.[c]sh: update wmRefresh to call wmUnset before updating the environment

Browse Source
This commit is contained in:
Henry Weller 2016-06-21 19:48:19 +01:00
parent 96a038f281
commit ab0b5545b4
5 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/config.csh/aliases
View File

@ -38,12 +38,10 @@ alias wm32 'wmSet WM_ARCH_OPTION=32'
alias wmSP 'wmSet WM_PRECISION_OPTION=SP'
alias wmDP 'wmSet WM_PRECISION_OPTION=DP'
# Refresh the environment
alias wmRefresh 'wmSet $FOAM_SETTINGS'
# Clear env
alias wmUnset 'source $WM_PROJECT_DIR/etc/config.csh/unset'
# Toggle wmakeScheduler on/off
# - also need to set WM_HOSTS
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -70,6 +68,11 @@ alias tut 'cd $FOAM_TUTORIALS'
alias run 'cd $FOAM_RUN'
# Refresh the environment
# ~~~~~~~~~~~~~~~~~~~~~~~
alias wmRefresh 'set wmProjectDir=$WM_PROJECT_DIR; set foamSettings=$FOAM_SETTINGS; wmUnset; source $wmProjectDir/etc/cshrc $foamSettings'
# Change OpenFOAM version
# ~~~~~~~~~~~~~~~~~~~~~~~
alias foamVersion \

11
etc/config.csh/unset
View File

@ -38,9 +38,13 @@ if ( $?WM_PROJECT_DIR ) then
endif
# The old dirs to be cleaned from the environment variables
set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
$HOME/$WM_PROJECT/$LOGNAME $WM_PROJECT_SITE \
$FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN $ParaView_DIR"
set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$LOGNAME $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN"
if ( $?WM_PROJECT_SITE ) then
set foamOldDirs="$foamOldDirs $WM_PROJECT_SITE"
endif
if ( $?ParaView_DIR ) then
set foamOldDirs="$foamOldDirs $ParaView_DIR"
endif
#------------------------------------------------------------------------------
@ -125,6 +129,7 @@ unsetenv PV_PLUGIN_PATH
#------------------------------------------------------------------------------
# Unset CGAL-related environment variables
unsetenv BOOST_ARCH_PATH
unsetenv CGAL_ARCH_PATH

15
etc/config.sh/aliases
View File

@ -38,9 +38,6 @@ alias wm32='wmSet WM_ARCH_OPTION=32'
alias wmSP='wmSet WM_PRECISION_OPTION=SP'
alias wmDP='wmSet WM_PRECISION_OPTION=DP'
# Refresh the environment
alias wmRefresh='wmSet $FOAM_SETTINGS'
# Clear env
alias wmUnset='. $WM_PROJECT_DIR/etc/config.sh/unset'
@ -70,6 +67,18 @@ alias tut='cd $FOAM_TUTORIALS'
alias run='cd $FOAM_RUN'
# Refresh the environment
# ~~~~~~~~~~~~~~~~~~~~~~~
unset wmRefresh
wmRefresh()
{
wmProjectDir=$WM_PROJECT_DIR
foamSettings=$FOAM_SETTINGS
wmUnset
. $wmProjectDir/etc/bashrc $foamSettings
}
# Change OpenFOAM version
# ~~~~~~~~~~~~~~~~~~~~~~~
unset foamVersion

3
etc/config.sh/unset
View File

@ -119,6 +119,7 @@ unset PV_PLUGIN_PATH
#------------------------------------------------------------------------------
# Unset CGAL-related environment variables
unset BOOST_ARCH_PATH
unset CGAL_ARCH_PATH
@ -151,7 +152,6 @@ unalias wm32
unalias wmSP
unalias wmDP
unalias wmRefresh
unalias wmUnset
unalias wmSchedOn
@ -168,6 +168,7 @@ unalias util
unalias tut
unalias run
unset wmRefresh
unset foamVersion
unset foamPV

17
etc/cshrc
View File

@ -105,7 +105,22 @@ setenv FOAM_SIGFPE
################################################################################
# The old dirs to be cleaned from the environment variables
set foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR $HOME/$WM_PROJECT/$LOGNAME $FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN"
set foamOldDirs=
if ( $?WM_PROJECT_DIR ) then
set foamOldDirs="$foamOldDirs $WM_PROJECT_DIR"
endif
if ( $?WM_THIRD_PARTY_DIR ) then
set foamOldDirs="$foamOldDirs $WM_THIRD_PARTY_DIR"
endif
if ( $?WM_PROJECT ) then
set foamOldDirs="$foamOldDirs $HOME/$WM_PROJECT/$LOGNAME"
endif
if ( $?FOAM_SITE_APPBIN ) then
set foamOldDirs="$foamOldDirs $FOAM_SITE_APPBIN"
endif
if ( $?FOAM_SITE_LIBBIN ) then
set foamOldDirs="$foamOldDirs $FOAM_SITE_LIBBIN"
endif
# Location of installation
# ~~~~~~~~~~~~~~~~~~~~~~~~