diff --git a/etc/bashrc b/etc/bashrc index 310d5fe00d..b2c33f3da0 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -169,99 +169,6 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile prefs.sh` export FOAM_SETTINGS="$@" _foamEval $@ - -# Detect system type and set environment variables appropriately -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -export WM_ARCH=`uname -s` - -case $WM_ARCH in -Linux) - WM_ARCH=linux - - # compiler specifics - case `uname -m` in - i686) - ;; - - x86_64) - case "$WM_ARCH_OPTION" in - 32) - export WM_COMPILER_ARCH='-64' - export WM_CC='gcc' - export WM_CXX='g++' - export WM_CFLAGS='-m32 -fPIC' - export WM_CXXFLAGS='-m32 -fPIC' - export WM_LDFLAGS='-m32' - ;; - 64) - WM_ARCH=linux64 - export WM_COMPILER_LIB_ARCH=64 - export WM_CC='gcc' - export WM_CXX='g++' - export WM_CFLAGS='-m64 -fPIC' - export WM_CXXFLAGS='-m64 -fPIC' - export WM_LDFLAGS='-m64' - ;; - *) - echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64" - ;; - esac - ;; - - ia64) - WM_ARCH=linuxIA64 - export WM_COMPILER=I64 - ;; - - mips64) - WM_ARCH=SiCortex64 - WM_MPLIB=MPI - export WM_COMPILER_LIB_ARCH=64 - export WM_CC='gcc' - export WM_CXX='g++' - export WM_CFLAGS='-mabi=64 -fPIC' - export WM_CXXFLAGS='-mabi=64 -fPIC' - export WM_LDFLAGS='-mabi=64 -G0' - ;; - - ppc64) - WM_ARCH=linuxPPC64 - export WM_COMPILER_LIB_ARCH=64 - export WM_CC='gcc' - export WM_CXX='g++' - export WM_CFLAGS='-m64 -fPIC' - export WM_CXXFLAGS='-m64 -fPIC' - export WM_LDFLAGS='-m64' - ;; - - *) - echo Unknown processor type `uname -m` for Linux - ;; - esac - ;; - -SunOS) - WM_ARCH=SunOS64 - WM_MPLIB=FJMPI - export WM_COMPILER_LIB_ARCH=64 - export WM_CC='gcc' - export WM_CXX='g++' - export WM_CFLAGS='-mabi=64 -fPIC' - export WM_CXXFLAGS='-mabi=64 -fPIC' - export WM_LDFLAGS='-mabi=64 -G0' - ;; - -*) # an unsupported operating system - cat < 0 ) end -# Detect system type and set environment variables -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -setenv WM_ARCH `uname -s` - -switch ($WM_ARCH) -case Linux: - setenv WM_ARCH linux - - switch (`uname -m`) - case i686: - breaksw - - case x86_64: - switch ($WM_ARCH_OPTION) - case 32: - setenv WM_COMPILER_ARCH '-64' - setenv WM_CC 'gcc' - setenv WM_CXX 'g++' - setenv WM_CFLAGS '-m32 -fPIC' - setenv WM_CXXFLAGS '-m32 -fPIC' - setenv WM_LDFLAGS '-m32' - breaksw - - case 64: - setenv WM_ARCH linux64 - setenv WM_COMPILER_LIB_ARCH 64 - setenv WM_CC 'gcc' - setenv WM_CXX 'g++' - setenv WM_CFLAGS '-m64 -fPIC' - setenv WM_CXXFLAGS '-m64 -fPIC' - setenv WM_LDFLAGS '-m64' - breaksw - - default: - echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64" - breaksw - - endsw - breaksw - - case ia64: - setenv WM_ARCH linuxIA64 - setenv WM_COMPILER I64 - breaksw - - case mips64: - setenv WM_ARCH SiCortex64 - setenv WM_MPLIB MPI - setenv WM_COMPILER_LIB_ARCH 64 - setenv WM_CC 'gcc' - setenv WM_CXX 'g++' - setenv WM_CFLAGS '-mabi=64 -fPIC' - setenv WM_CXXFLAGS '-mabi=64 -fPIC' - setenv WM_LDFLAGS '-mabi=64 -G0' - breaksw - - case ppc64: - setenv WM_ARCH linuxPPC64 - setenv WM_COMPILER_LIB_ARCH 64 - setenv WM_CC 'gcc' - setenv WM_CXX 'g++' - setenv WM_CFLAGS '-m64 -fPIC' - setenv WM_CXXFLAGS '-m64 -fPIC' - setenv WM_LDFLAGS '-m64' - breaksw - - default: - echo Unknown processor type `uname -m` for Linux - breaksw - - endsw - breaksw - -case SunOS: - setenv WM_ARCH SunOS64 - setenv WM_MPLIB FJMPI - setenv WM_COMPILER_LIB_ARCH 64 - setenv WM_CC 'gcc' - setenv WM_CXX 'g++' - setenv WM_CFLAGS '-mabi=64 -fPIC' - setenv WM_CXXFLAGS '-mabi=64 -fPIC' - setenv WM_LDFLAGS '-mabi=64 -G0' - breaksw - -default: - echo - echo "Your '$WM_ARCH' operating system is not supported by this release" - echo "of OpenFOAM. For further assistance, please contact www.OpenFOAM.com" - echo - breaksw - -endsw - - # Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH) # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ set foamClean=$WM_PROJECT_DIR/bin/foamCleanPath diff --git a/etc/settings.csh b/etc/settings.csh index 76beaadb51..5a6b6c273a 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -37,6 +37,100 @@ alias _foamAddLib 'setenv LD_LIBRARY_PATH \!*\:${LD_LIBRARY_PATH}' # prefix to MANPATH alias _foamAddMan 'setenv MANPATH \!*\:${MANPATH}' +#------------------------------------------------------------------------------ +# Set environment variables according to system type +setenv WM_ARCH `uname -s` + +switch ($WM_ARCH) +case Linux: + setenv WM_ARCH linux + + switch (`uname -m`) + case i686: + breaksw + + case x86_64: + switch ($WM_ARCH_OPTION) + case 32: + setenv WM_COMPILER_ARCH '-64' + setenv WM_CC 'gcc' + setenv WM_CXX 'g++' + setenv WM_CFLAGS '-m32 -fPIC' + setenv WM_CXXFLAGS '-m32 -fPIC' + setenv WM_LDFLAGS '-m32' + breaksw + + case 64: + setenv WM_ARCH linux64 + setenv WM_COMPILER_LIB_ARCH 64 + setenv WM_CC 'gcc' + setenv WM_CXX 'g++' + setenv WM_CFLAGS '-m64 -fPIC' + setenv WM_CXXFLAGS '-m64 -fPIC' + setenv WM_LDFLAGS '-m64' + breaksw + + default: + echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64" + breaksw + + endsw + breaksw + + case ia64: + setenv WM_ARCH linuxIA64 + setenv WM_COMPILER I64 + breaksw + + case mips64: + setenv WM_ARCH SiCortex64 + setenv WM_MPLIB MPI + setenv WM_COMPILER_LIB_ARCH 64 + setenv WM_CC 'gcc' + setenv WM_CXX 'g++' + setenv WM_CFLAGS '-mabi=64 -fPIC' + setenv WM_CXXFLAGS '-mabi=64 -fPIC' + setenv WM_LDFLAGS '-mabi=64 -G0' + breaksw + + case ppc64: + setenv WM_ARCH linuxPPC64 + setenv WM_COMPILER_LIB_ARCH 64 + setenv WM_CC 'gcc' + setenv WM_CXX 'g++' + setenv WM_CFLAGS '-m64 -fPIC' + setenv WM_CXXFLAGS '-m64 -fPIC' + setenv WM_LDFLAGS '-m64' + breaksw + + default: + echo Unknown processor type `uname -m` for Linux + breaksw + + endsw + breaksw + +case SunOS: + setenv WM_ARCH SunOS64 + setenv WM_MPLIB FJMPI + setenv WM_COMPILER_LIB_ARCH 64 + setenv WM_CC 'gcc' + setenv WM_CXX 'g++' + setenv WM_CFLAGS '-mabi=64 -fPIC' + setenv WM_CXXFLAGS '-mabi=64 -fPIC' + setenv WM_LDFLAGS '-mabi=64 -G0' + breaksw + +default: + echo + echo "Your '$WM_ARCH' operating system is not supported by this release" + echo "of OpenFOAM. For further assistance, please contact www.OpenFOAM.com" + echo + breaksw + +endsw + + #------------------------------------------------------------------------------ # location of the jobControl directory diff --git a/etc/settings.sh b/etc/settings.sh index edbabe3cb6..e86de7de25 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -60,6 +60,98 @@ _foamAddMan() done } +#------------------------------------------------------------------------------ +# Set environment variables according to system type +export WM_ARCH=`uname -s` + +case "$WM_ARCH" in +Linux) + WM_ARCH=linux + + # compiler specifics + case `uname -m` in + i686) + ;; + + x86_64) + case "$WM_ARCH_OPTION" in + 32) + export WM_COMPILER_ARCH='-64' + export WM_CC='gcc' + export WM_CXX='g++' + export WM_CFLAGS='-m32 -fPIC' + export WM_CXXFLAGS='-m32 -fPIC' + export WM_LDFLAGS='-m32' + ;; + 64) + WM_ARCH=linux64 + export WM_COMPILER_LIB_ARCH=64 + export WM_CC='gcc' + export WM_CXX='g++' + export WM_CFLAGS='-m64 -fPIC' + export WM_CXXFLAGS='-m64 -fPIC' + export WM_LDFLAGS='-m64' + ;; + *) + echo "Unknown WM_ARCH_OPTION '$WM_ARCH_OPTION', should be 32 or 64" + ;; + esac + ;; + + ia64) + WM_ARCH=linuxIA64 + export WM_COMPILER=I64 + ;; + + mips64) + WM_ARCH=SiCortex64 + WM_MPLIB=MPI + export WM_COMPILER_LIB_ARCH=64 + export WM_CC='gcc' + export WM_CXX='g++' + export WM_CFLAGS='-mabi=64 -fPIC' + export WM_CXXFLAGS='-mabi=64 -fPIC' + export WM_LDFLAGS='-mabi=64 -G0' + ;; + + ppc64) + WM_ARCH=linuxPPC64 + export WM_COMPILER_LIB_ARCH=64 + export WM_CC='gcc' + export WM_CXX='g++' + export WM_CFLAGS='-m64 -fPIC' + export WM_CXXFLAGS='-m64 -fPIC' + export WM_LDFLAGS='-m64' + ;; + + *) + echo Unknown processor type `uname -m` for Linux + ;; + esac + ;; + +SunOS) + WM_ARCH=SunOS64 + WM_MPLIB=FJMPI + export WM_COMPILER_LIB_ARCH=64 + export WM_CC='gcc' + export WM_CXX='g++' + export WM_CFLAGS='-mabi=64 -fPIC' + export WM_CXXFLAGS='-mabi=64 -fPIC' + export WM_LDFLAGS='-mabi=64 -G0' + ;; + +*) # an unsupported operating system + cat <