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

STYLE: use 'foamCompiler' instead of 'compilerInstall'

Browse Source 
- more obvious in its meaning
This commit is contained in:
Mark Olesen
2010-12-23 06:28:49 +01:00
parent 603aa1e61c
commit 312d15c701
5 changed files with 35 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/prefs.csh-EXAMPLE
View File

@ -38,7 +38,7 @@
## Specify system compiler
## ~~~~~~~~~~~~~~~~~~~~~~~
#set compilerInstall=system
#set foamCompiler=system
## Specify system openmpi
## ~~~~~~~~~~~~~~~~~~~~~~

2
etc/prefs.sh-EXAMPLE
View File

@ -38,7 +38,7 @@
# Specify system compiler
# ~~~~~~~~~~~~~~~~~~~~~~~
compilerInstall=system
foamCompiler=system
# Specify system openmpi
# ~~~~~~~~~~~~~~~~~~~~~~

21
etc/settings.csh
View File

@ -26,7 +26,7 @@
#
# Description
# Startup file for OpenFOAM
# Sourced from OpenFOAM-??/etc/cshrc
# Sourced from OpenFOAM-<VERSION>/etc/cshrc
#
#------------------------------------------------------------------------------
@ -68,8 +68,10 @@ setenv FOAM_UTILITIES $FOAM_APP/utilities
setenv FOAM_SOLVERS $FOAM_APP/solvers
setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
# add OpenFOAM scripts and wmake to the path
setenv PATH ${WM_DIR}:${WM_PROJECT_DIR}/bin:${PATH}
# add wmake to the path - not required for runtime only environment
if ( -d "${WM_DIR}" ) setenv PATH ${WM_DIR}:${PATH}
# add OpenFOAM scripts to the path
setenv PATH ${WM_PROJECT_DIR}/bin:${PATH}
_foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}
# Make sure to pick up dummy versions of external libraries last
@ -83,11 +85,12 @@ unsetenv MPFR_ARCH_PATH
# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# compilerInstall = OpenFOAM | system
if ( ! $?compilerInstall ) set compilerInstall=system
# foamCompiler = system | ThirdParty (OpenFOAM)
if ( ! $?foamCompiler ) set foamCompiler=system
switch ("$compilerInstall")
switch ("$foamCompiler")
case OpenFOAM:
case ThirdParty:
switch ("$WM_COMPILER")
case Gcc:
case Gcc++0x:
@ -143,7 +146,7 @@ case OpenFOAM:
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
echo " Cannot find $gccDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'compilerInstall' setting to 'system' in this file"
echo " change the 'foamCompiler' setting to 'system' in this file"
echo
endif
@ -181,7 +184,7 @@ case OpenFOAM:
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:"
echo " Cannot find $clangDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'compilerInstall' setting to 'system' in this file"
echo " change the 'foamCompiler' setting to 'system' in this file"
echo
endif
@ -382,6 +385,6 @@ endif
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
unalias _foamAddPath _foamAddLib _foamAddMan
unset compilerInstall minBufferSize
unset foamCompiler minBufferSize
# ----------------------------------------------------------------- end-of-file

22
etc/settings.sh
View File

@ -26,7 +26,7 @@
#
# Description
# Startup file for OpenFOAM
# Sourced from OpenFOAM-??/etc/bashrc
# Sourced from OpenFOAM-<VERSION>/etc/bashrc
#
#------------------------------------------------------------------------------
@ -91,8 +91,10 @@ export FOAM_UTILITIES=$FOAM_APP/utilities
export FOAM_SOLVERS=$FOAM_APP/solvers
export FOAM_RUN=$WM_PROJECT_USER_DIR/run
# add OpenFOAM scripts and wmake to the path
export PATH=$WM_DIR:$WM_PROJECT_DIR/bin:$PATH
# add wmake to the path - not required for runtime only environment
[ -d "$WM_DIR" ] && PATH=$WM_DIR:$PATH
# add OpenFOAM scripts to the path
export PATH=$WM_PROJECT_DIR/bin:$PATH
_foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN
# Make sure to pick up dummy versions of external libraries last
@ -105,11 +107,11 @@ unset MPFR_ARCH_PATH
# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# compilerInstall = OpenFOAM | system
: ${compilerInstall:=system}
# foamCompiler = system | ThirdParty (OpenFOAM)
: ${foamCompiler:=system}
case "${compilerInstall:-OpenFOAM}" in
OpenFOAM)
case "${foamCompiler}" in
OpenFOAM | ThirdParty)
case "$WM_COMPILER" in
Gcc | Gcc++0x)
gcc_version=gcc-4.4.3
@ -161,7 +163,7 @@ OpenFOAM)
echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
echo " Cannot find $gccDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'compilerInstall' setting to 'system' in this file"
echo " change the 'foamCompiler' setting to 'system' in this file"
echo
}
@ -202,7 +204,7 @@ OpenFOAM)
echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:"
echo " Cannot find $clangDir installation."
echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'compilerInstall' setting to 'system' in this file"
echo " change the 'foamCompiler' setting to 'system' in this file"
echo
}
@ -406,6 +408,6 @@ export MPI_BUFFER_SIZE
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
unset _foamAddPath _foamAddLib _foamAddMan compilerInstall minBufferSize
unset _foamAddPath _foamAddLib _foamAddMan foamCompiler minBufferSize
# ----------------------------------------------------------------- end-of-file