mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
STYLE: relocate bashrc,cshrc projectDir detection as (advanced / legacy)
- makes the standard config variables more visible
This commit is contained in:
Mark Olesen
committed by
Andrew Heather
Andrew Heather
parent
4862cb4603
commit
615565ad40
48
etc/bashrc
48
etc/bashrc
@ -18,7 +18,7 @@
|
|||||||
# The OpenFOAM environment for POSIX shell (eg, bash,dash,zsh,...).
|
# The OpenFOAM environment for POSIX shell (eg, bash,dash,zsh,...).
|
||||||
# Source manually or from the ~/.bashrc or ~/.profile files.
|
# Source manually or from the ~/.bashrc or ~/.profile files.
|
||||||
#
|
#
|
||||||
# Many settings can be overridden using a <prefs.sh> file:
|
# Most settings can be overridden with a <prefs.sh> file:
|
||||||
#
|
#
|
||||||
# - Base values (eg, from system admin):
|
# - Base values (eg, from system admin):
|
||||||
# - $WM_PROJECT_DIR/etc/prefs.sh
|
# - $WM_PROJECT_DIR/etc/prefs.sh
|
||||||
@ -45,25 +45,9 @@
|
|||||||
export WM_PROJECT=OpenFOAM
|
export WM_PROJECT=OpenFOAM
|
||||||
export WM_PROJECT_VERSION=com
|
export WM_PROJECT_VERSION=com
|
||||||
|
|
||||||
# [projectDir] - directory containing this OpenFOAM version.
|
#------------------------------------------------------------------------------
|
||||||
# \- When this file is located as $WM_PROJECT_DIR/etc/bashrc, the next lines
|
|
||||||
# should work when sourced by BASH or ZSH shells. If this however fails,
|
|
||||||
# set one of the fallback values to an appropriate path.
|
|
||||||
#
|
|
||||||
# This can be removed if an absolute path is provided for WM_PROJECT_DIR
|
|
||||||
# later on in this file
|
|
||||||
# --
|
|
||||||
projectDir="${BASH_SOURCE:-${ZSH_NAME:+$0}}";
|
|
||||||
[ -n "$projectDir" ] && projectDir="$(\cd $(dirname $projectDir)/.. && \pwd -L)" ||\
|
|
||||||
projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
|
||||||
# projectDir="/opt/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
|
||||||
# projectDir="/usr/local/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
|
||||||
# END OF (NORMAL) USER EDITABLE PART
|
|
||||||
################################################################################
|
|
||||||
: # Safety statement (if the user removed all fallback values)
|
|
||||||
|
|
||||||
# Configuration environment variables.
|
# Configuration environment variables.
|
||||||
# Should override via <prefs.sh> file instead of editing this file.
|
# Override with <prefs.sh> instead of editing here.
|
||||||
|
|
||||||
# [WM_COMPILER_TYPE] - Compiler location:
|
# [WM_COMPILER_TYPE] - Compiler location:
|
||||||
# = system | ThirdParty
|
# = system | ThirdParty
|
||||||
@ -84,8 +68,7 @@ export WM_LABEL_SIZE=32
|
|||||||
|
|
||||||
# [WM_COMPILE_OPTION] - Optimised, debug, profiling, other:
|
# [WM_COMPILE_OPTION] - Optimised, debug, profiling, other:
|
||||||
# = Opt | Debug | Prof
|
# = Opt | Debug | Prof
|
||||||
# Other is processor or packaging specific, for example
|
# Other is processor or packaging specific (eg, OptKNL)
|
||||||
# = OptKNL
|
|
||||||
export WM_COMPILE_OPTION=Opt
|
export WM_COMPILE_OPTION=Opt
|
||||||
|
|
||||||
# [WM_MPLIB] - MPI implementation:
|
# [WM_MPLIB] - MPI implementation:
|
||||||
@ -98,6 +81,22 @@ export WM_MPLIB=SYSTEMOPENMPI
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# (advanced / legacy)
|
# (advanced / legacy)
|
||||||
|
|
||||||
|
# [projectDir] - directory containing this OpenFOAM version.
|
||||||
|
# \- When this file is located as $WM_PROJECT_DIR/etc/bashrc, the next lines
|
||||||
|
# should work when sourced by BASH or ZSH shells. If this however fails,
|
||||||
|
# set one of the fallback values to an appropriate path.
|
||||||
|
#
|
||||||
|
# This can be removed if an absolute path is provided for WM_PROJECT_DIR
|
||||||
|
# later on in this file
|
||||||
|
# --
|
||||||
|
projectDir="${BASH_SOURCE:-${ZSH_NAME:+$0}}";
|
||||||
|
[ -n "$projectDir" ] && projectDir="$(\cd $(dirname $projectDir)/.. && \pwd -L)" ||\
|
||||||
|
projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
||||||
|
# projectDir="/opt/openfoam/OpenFOAM-$WM_PROJECT_VERSION"
|
||||||
|
# projectDir="/usr/local/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
||||||
|
################################################################################
|
||||||
|
: # Safety statement (if the user removed all fallback values)
|
||||||
|
|
||||||
# [FOAM_SIGFPE] - Trap floating-point exceptions.
|
# [FOAM_SIGFPE] - Trap floating-point exceptions.
|
||||||
# - overrides the 'trapFpe' controlDict entry
|
# - overrides the 'trapFpe' controlDict entry
|
||||||
# = true | false
|
# = true | false
|
||||||
@ -116,8 +115,8 @@ export WM_MPLIB=SYSTEMOPENMPI
|
|||||||
# - unset: equivalent to ~/.OpenFOAM/jobControl
|
# - unset: equivalent to ~/.OpenFOAM/jobControl
|
||||||
# export FOAM_JOB_DIR="$HOME/.OpenFOAM/jobControl"
|
# export FOAM_JOB_DIR="$HOME/.OpenFOAM/jobControl"
|
||||||
|
|
||||||
# [WM_OSTYPE] - Operating System Type
|
# [WM_OSTYPE] - Operating System Type (set automatically)
|
||||||
# = POSIX
|
# = POSIX | MSwindows
|
||||||
#export WM_OSTYPE=POSIX
|
#export WM_OSTYPE=POSIX
|
||||||
|
|
||||||
# [WM_ARCH_OPTION] - compiling with -m32 option on 64-bit system
|
# [WM_ARCH_OPTION] - compiling with -m32 option on 64-bit system
|
||||||
@ -127,6 +126,7 @@ export WM_MPLIB=SYSTEMOPENMPI
|
|||||||
#export WM_ARCH_OPTION=64
|
#export WM_ARCH_OPTION=64
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
# NO (NORMAL) USER EDITING BELOW HERE
|
||||||
|
|
||||||
# Capture values of old directories to be cleaned from PATH, LD_LIBRARY_PATH
|
# Capture values of old directories to be cleaned from PATH, LD_LIBRARY_PATH
|
||||||
foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
|
foamOldDirs="$WM_PROJECT_DIR $WM_THIRD_PARTY_DIR \
|
||||||
@ -144,7 +144,7 @@ export WM_PROJECT_USER_DIR="$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION"
|
|||||||
# Normally defined in calling environment
|
# Normally defined in calling environment
|
||||||
|
|
||||||
|
|
||||||
# Finalize setup of OpenFOAM environment for POSIX shell
|
# Finalize setup of OpenFOAM environment
|
||||||
if [ -d "$WM_PROJECT_DIR" ]
|
if [ -d "$WM_PROJECT_DIR" ]
|
||||||
then
|
then
|
||||||
if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
|
if [ -n "$FOAM_VERBOSE" ] && [ -n "$PS1" ]
|
||||||
|
|||||||
52
etc/cshrc
52
etc/cshrc
@ -18,7 +18,7 @@
|
|||||||
# The OpenFOAM environment for C-shell (csh, tcsh).
|
# The OpenFOAM environment for C-shell (csh, tcsh).
|
||||||
# Source manually or from the ~/.cshrc or ~/.login files.
|
# Source manually or from the ~/.cshrc or ~/.login files.
|
||||||
#
|
#
|
||||||
# Many settings can be overridden using a <prefs.csh> file:
|
# Most settings can be overridden with a <prefs.csh> file:
|
||||||
#
|
#
|
||||||
# - Base values (eg, from system admin):
|
# - Base values (eg, from system admin):
|
||||||
# - $WM_PROJECT_DIR/etc/prefs.csh
|
# - $WM_PROJECT_DIR/etc/prefs.csh
|
||||||
@ -45,27 +45,9 @@
|
|||||||
setenv WM_PROJECT OpenFOAM
|
setenv WM_PROJECT OpenFOAM
|
||||||
setenv WM_PROJECT_VERSION com
|
setenv WM_PROJECT_VERSION com
|
||||||
|
|
||||||
# [projectDir] - parent directory containing the OpenFOAM installation.
|
#------------------------------------------------------------------------------
|
||||||
# \- When this file is located as $WM_PROJECT_DIR/etc/cshrc, the next lines
|
|
||||||
# should work when sourced by CSH or TCSH shells. If this however fails,
|
|
||||||
# set one of the fallback values to an appropriate path.
|
|
||||||
#
|
|
||||||
# This can be removed if an absolute path is provided for WM_PROJECT_DIR
|
|
||||||
# later on in this file.
|
|
||||||
# --
|
|
||||||
# If the directory naming does not match WM_PROJECT, need to change here
|
|
||||||
set projectName="$WM_PROJECT"
|
|
||||||
set projectDir=`lsof +p $$ |& \
|
|
||||||
sed -ne 's@^[^/]*@@;\@/'"$projectName"'[^/]*/etc/cshrc@{s@/etc/cshrc.*@@p; q}'`
|
|
||||||
|
|
||||||
# set projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
|
||||||
# set projectDir="/opt/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
|
||||||
# set projectDir="/usr/local/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
|
||||||
# END OF (NORMAL) USER EDITABLE PART
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
# Configuration environment variables.
|
# Configuration environment variables.
|
||||||
# Should override via <prefs.csh> file instead of editing this file.
|
# Override with <prefs.csh> instead of editing here.
|
||||||
|
|
||||||
# [WM_COMPILER_TYPE] - Compiler location:
|
# [WM_COMPILER_TYPE] - Compiler location:
|
||||||
# = system | ThirdParty
|
# = system | ThirdParty
|
||||||
@ -86,8 +68,7 @@ setenv WM_LABEL_SIZE 32
|
|||||||
|
|
||||||
# [WM_COMPILE_OPTION] - Optimised, debug, profiling, other:
|
# [WM_COMPILE_OPTION] - Optimised, debug, profiling, other:
|
||||||
# = Opt | Debug | Prof
|
# = Opt | Debug | Prof
|
||||||
# Other is processor or packaging specific, for example
|
# Other is processor or packaging specific (eg, OptKNL)
|
||||||
# = OptKNL
|
|
||||||
setenv WM_COMPILE_OPTION Opt
|
setenv WM_COMPILE_OPTION Opt
|
||||||
|
|
||||||
# [WM_MPLIB] - MPI implementation:
|
# [WM_MPLIB] - MPI implementation:
|
||||||
@ -100,6 +81,24 @@ setenv WM_MPLIB SYSTEMOPENMPI
|
|||||||
#------------------------------------------------------------------------------
|
#------------------------------------------------------------------------------
|
||||||
# (advanced / legacy)
|
# (advanced / legacy)
|
||||||
|
|
||||||
|
# [projectDir] - directory containing this OpenFOAM version.
|
||||||
|
# \- When this file is located as $WM_PROJECT_DIR/etc/cshrc, the next lines
|
||||||
|
# should work when sourced by CSH or TCSH shells. If this however fails,
|
||||||
|
# set one of the fallback values to an appropriate path.
|
||||||
|
#
|
||||||
|
# This can be removed if an absolute path is provided for WM_PROJECT_DIR
|
||||||
|
# later on in this file.
|
||||||
|
# --
|
||||||
|
# If the directory naming does not match WM_PROJECT, need to change here
|
||||||
|
set projectName="$WM_PROJECT"
|
||||||
|
set projectDir=`lsof +p $$ |& \
|
||||||
|
sed -ne 's@^[^/]*@@;\@/'"$projectName"'[^/]*/etc/cshrc@{s@/etc/cshrc.*@@p; q}'`
|
||||||
|
|
||||||
|
# set projectDir="$HOME/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
||||||
|
# set projectDir="/opt/openfoam/OpenFOAM-$WM_PROJECT_VERSION"
|
||||||
|
# set projectDir="/usr/local/OpenFOAM/OpenFOAM-$WM_PROJECT_VERSION"
|
||||||
|
################################################################################
|
||||||
|
|
||||||
# [FOAM_SIGFPE] - Trap floating-point exceptions.
|
# [FOAM_SIGFPE] - Trap floating-point exceptions.
|
||||||
# - overrides the 'trapFpe' controlDict entry
|
# - overrides the 'trapFpe' controlDict entry
|
||||||
# = true | false
|
# = true | false
|
||||||
@ -118,8 +117,8 @@ setenv WM_MPLIB SYSTEMOPENMPI
|
|||||||
# - unset: equivalent to ~/.OpenFOAM/jobControl
|
# - unset: equivalent to ~/.OpenFOAM/jobControl
|
||||||
#setenv FOAM_JOB_DIR "$HOME/.OpenFOAM/jobControl"
|
#setenv FOAM_JOB_DIR "$HOME/.OpenFOAM/jobControl"
|
||||||
|
|
||||||
# [WM_OSTYPE] - Operating System Type
|
# [WM_OSTYPE] - Operating System Type (set automatically)
|
||||||
# = POSIX
|
# = POSIX | MSwindows
|
||||||
#setenv WM_OSTYPE POSIX
|
#setenv WM_OSTYPE POSIX
|
||||||
|
|
||||||
# [WM_ARCH_OPTION] - compiling with -m32 option on 64-bit system
|
# [WM_ARCH_OPTION] - compiling with -m32 option on 64-bit system
|
||||||
@ -129,8 +128,9 @@ setenv WM_MPLIB SYSTEMOPENMPI
|
|||||||
#setenv WM_ARCH_OPTION 64
|
#setenv WM_ARCH_OPTION 64
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
# NO (NORMAL) USER EDITING BELOW HERE
|
||||||
|
|
||||||
# Old directories to be cleaned from PATH, LD_LIBRARY_PATH
|
# Capture values of old directories to be cleaned from PATH, LD_LIBRARY_PATH
|
||||||
set foamOldDirs=
|
set foamOldDirs=
|
||||||
if ( $?WM_PROJECT_DIR ) then
|
if ( $?WM_PROJECT_DIR ) then
|
||||||
set foamOldDirs="$foamOldDirs $WM_PROJECT_DIR"
|
set foamOldDirs="$foamOldDirs $WM_PROJECT_DIR"
|
||||||
|
|||||||
Reference in New Issue
Block a user