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

Merge branch 'olesenm'

Browse Source
This commit is contained in:
andy
2011-05-24 11:56:23 +01:00
parent 3efed9f334 020d5f9b2d
commit 6976dc9bbc
9 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
etc/bashrc
View File

@ -120,7 +120,12 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
# Location of site-specific templates etc # Location of site-specific templates etc
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# unset is equivalent to $WM_PROJECT_INST_DIR/site # unset is equivalent to $WM_PROJECT_INST_DIR/site
unset WM_PROJECT_SITE if [ -d "$WM_PROJECT_SITE" ]
then
export WM_PROJECT_SITE
else
unset WM_PROJECT_SITE
fi
# Location of user files # Location of user files
# ~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~
@ -200,7 +205,7 @@ export PATH LD_LIBRARY_PATH MANPATH
# Source project setup files # Source project setup files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamSource $WM_PROJECT_DIR/etc/settings.sh _foamSource $WM_PROJECT_DIR/etc/config/settings.sh
_foamSource $WM_PROJECT_DIR/etc/config/aliases.sh _foamSource $WM_PROJECT_DIR/etc/config/aliases.sh

6
etc/config/README
View File

@ -3,9 +3,6 @@ The main OpenFOAM settings are located in the parent etc/ directory
* bashrc, cshrc * bashrc, cshrc
entry point for sourcing entry point for sourcing
* settings.csh, settings.sh
core settings
* prefs.csh, prefs.sh * prefs.csh, prefs.sh
these files are untracked and can be used for some site-defined these files are untracked and can be used for some site-defined
settings settings
@ -14,6 +11,9 @@ The main OpenFOAM settings are located in the parent etc/ directory
The etc/config/ directory contains various configuration files in The etc/config/ directory contains various configuration files in
sh/csh variants: sh/csh variants:
* settings.csh, settings.sh
core settings
* aliases.csh, aliases.sh * aliases.csh, aliases.sh
aliases for interactive shells aliases for interactive shells

2
etc/config/example/compiler.csh
View File

@ -26,7 +26,7 @@
# #
# Description # Description
# Example of fine tuning ThirdParty compiler settings for OpenFOAM # Example of fine tuning ThirdParty compiler settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.csh # Sourced from OpenFOAM-<VERSION>/etc/config/settings.csh
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

2
etc/config/example/compiler.sh
View File

@ -26,7 +26,7 @@
# #
# Description # Description
# Example of fine tuning ThirdParty compiler settings for OpenFOAM # Example of fine tuning ThirdParty compiler settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.sh # Sourced from OpenFOAM-<VERSION>/etc/config/settings.sh
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

2
etc/config/example/openmpi.csh
View File

@ -26,7 +26,7 @@
# #
# Description # Description
# Example of fine tuning openmpi settings for OpenFOAM # Example of fine tuning openmpi settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.csh # Sourced from OpenFOAM-<VERSION>/etc/config/settings.csh
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

2
etc/config/example/openmpi.sh
View File

@ -26,7 +26,7 @@
# #
# Description # Description
# Example of fine tuning openmpi settings for OpenFOAM # Example of fine tuning openmpi settings for OpenFOAM
# Sourced from OpenFOAM-<VERSION>/etc/settings.sh # Sourced from OpenFOAM-<VERSION>/etc/config/settings.sh
# #
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------

10
etc/settings.csh → etc/config/settings.csh
View File

@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. # along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/settings.csh # etc/config/settings.csh
# #
# Description # Description
# Startup file for OpenFOAM # Startup file for OpenFOAM
@ -193,7 +193,7 @@ unsetenv MPFR_ARCH_PATH GMP_ARCH_PATH
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
if ( ! $?foamCompiler ) then if ( ! $?foamCompiler ) then
set foamCompiler=system set foamCompiler=system
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " foamCompiler not set, using '$foamCompiler'" echo " foamCompiler not set, using '$foamCompiler'"
endif endif
@ -241,7 +241,7 @@ case ThirdParty:
breaksw breaksw
default: default:
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " Unknown OpenFOAM compiler type '$WM_COMPILER'" echo " Unknown OpenFOAM compiler type '$WM_COMPILER'"
echo " Please check your settings" echo " Please check your settings"
echo echo
@ -262,7 +262,7 @@ case ThirdParty:
# Check that the compiler directory can be found # Check that the compiler directory can be found
if ( ! -d "$gccDir" ) then if ( ! -d "$gccDir" ) then
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " Cannot find $gccDir installation." echo " Cannot find $gccDir installation."
echo " Please install this compiler version or if you wish to use the system compiler," echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'" echo " change the 'foamCompiler' setting to 'system'"
@ -302,7 +302,7 @@ case ThirdParty:
# Check that the compiler directory can be found # Check that the compiler directory can be found
if ( ! -d "$clangDir" ) then if ( ! -d "$clangDir" ) then
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo "Warning in $WM_PROJECT_DIR/etc/config/settings.csh:"
echo " Cannot find $clangDir installation." echo " Cannot find $clangDir installation."
echo " Please install this compiler version or if you wish to use the system compiler," echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'" echo " change the 'foamCompiler' setting to 'system'"

10
etc/settings.sh → etc/config/settings.sh
View File

@ -22,7 +22,7 @@
# along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. # along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
# #
# File # File
# etc/settings.sh # etc/config/settings.sh
# #
# Description # Description
# Startup file for OpenFOAM # Startup file for OpenFOAM
@ -215,7 +215,7 @@ unset MPFR_ARCH_PATH GMP_ARCH_PATH
if [ -z "$foamCompiler" ] if [ -z "$foamCompiler" ]
then then
foamCompiler=system foamCompiler=system
echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:" 1>&2 echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:" 1>&2
echo " foamCompiler not set, using '$foamCompiler'" 1>&2 echo " foamCompiler not set, using '$foamCompiler'" 1>&2
fi fi
@ -258,7 +258,7 @@ OpenFOAM | ThirdParty)
;; ;;
*) *)
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:" echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:"
echo " Unknown OpenFOAM compiler type '$WM_COMPILER'" echo " Unknown OpenFOAM compiler type '$WM_COMPILER'"
echo " Please check your settings" echo " Please check your settings"
echo echo
@ -278,7 +278,7 @@ OpenFOAM | ThirdParty)
# Check that the compiler directory can be found # Check that the compiler directory can be found
[ -d "$gccDir" ] || { [ -d "$gccDir" ] || {
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:" echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:"
echo " Cannot find $gccDir installation." echo " Cannot find $gccDir installation."
echo " Please install this compiler version or if you wish to use the system compiler," echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'" echo " change the 'foamCompiler' setting to 'system'"
@ -322,7 +322,7 @@ OpenFOAM | ThirdParty)
# Check that the compiler directory can be found # Check that the compiler directory can be found
[ -d "$clangDir" ] || { [ -d "$clangDir" ] || {
echo echo
echo "Warning in $WM_PROJECT_DIR/etc/settings.sh:" echo "Warning in $WM_PROJECT_DIR/etc/config/settings.sh:"
echo " Cannot find $clangDir installation." echo " Cannot find $clangDir installation."
echo " Please install this compiler version or if you wish to use the system compiler," echo " Please install this compiler version or if you wish to use the system compiler,"
echo " change the 'foamCompiler' setting to 'system'" echo " change the 'foamCompiler' setting to 'system'"

12
etc/cshrc
View File

@ -107,9 +107,6 @@ if ( $?WM_PROJECT_INST_DIR ) then
set foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs" set foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs"
endif endif
endif endif
if ( $?WM_PROJECT_SITE ) then
set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
endif
# Location of installation # Location of installation
@ -124,7 +121,12 @@ setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
# Location of site-specific templates etc # Location of site-specific templates etc
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# unset is equivalent to $WM_PROJECT_INST_DIR/site # unset is equivalent to $WM_PROJECT_INST_DIR/site
unsetenv WM_PROJECT_SITE if ( $?WM_PROJECT_SITE ) then
set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
if ( ! -d "$WM_PROJECT_SITE" ) unsetenv WM_PROJECT_SITE
else
unsetenv WM_PROJECT_SITE
endif
# Location of user files # Location of user files
# ~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~
@ -194,7 +196,7 @@ if ( $status == 0 ) setenv MANPATH $cleaned
# Source project setup files # Source project setup files
# ~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~
_foamSource $WM_PROJECT_DIR/etc/settings.csh _foamSource $WM_PROJECT_DIR/etc/config/settings.csh
_foamSource $WM_PROJECT_DIR/etc/config/aliases.csh _foamSource $WM_PROJECT_DIR/etc/config/aliases.csh
# Source user setup files for optional packages # Source user setup files for optional packages