Merge branch 'master' of wikki.no-ip.biz:OpenFOAM-1.6-ext
This commit is contained in:
Hrvoje Jasak
commit
091e8ad9df
2 changed files with 31 additions and 40 deletions
38
etc/bashrc
38
etc/bashrc
|
|
@ -2,7 +2,7 @@
|
|||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright held by original author
|
||||
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
|
|
@ -33,12 +33,9 @@
|
|||
#------------------------------------------------------------------------------
|
||||
|
||||
export WM_PROJECT=OpenFOAM
|
||||
export WM_PROJECT_VERSION=1.6-ext
|
||||
export WM_PROJECT_VERSION=1.6.x
|
||||
|
||||
# helps to easily write #ifdefs to detect a dev-version
|
||||
export FOAM_DEV=1
|
||||
|
||||
###############################################################################
|
||||
################################################################################
|
||||
# USER EDITABLE PART
|
||||
#
|
||||
# either set $FOAM_INST_DIR before sourcing this file or set
|
||||
|
|
@ -95,8 +92,6 @@ export WM_COMPILER_LIB_ARCH=
|
|||
|
||||
# Compilation options (architecture, precision, optimised, debug or profiling)
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
export WM_NCOMPPROCS=12
|
||||
|
||||
# WM_ARCH_OPTION = 32 | 64
|
||||
: ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION
|
||||
|
||||
|
|
@ -133,6 +128,8 @@ Linux)
|
|||
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'
|
||||
|
|
@ -140,6 +137,8 @@ Linux)
|
|||
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'
|
||||
|
|
@ -158,6 +157,8 @@ Linux)
|
|||
mips64)
|
||||
WM_ARCH=SiCortex64
|
||||
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'
|
||||
|
|
@ -167,6 +168,8 @@ Linux)
|
|||
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'
|
||||
|
|
@ -178,24 +181,11 @@ Linux)
|
|||
esac
|
||||
;;
|
||||
|
||||
Darwin)
|
||||
case `uname -p` in
|
||||
powerpc)
|
||||
export WM_ARCH=darwinPpc
|
||||
;;
|
||||
i386)
|
||||
export WM_ARCH=darwinIntel
|
||||
;;
|
||||
*)
|
||||
echo "This seems to be an Intel-Mac please tell me the output of 'uname -p'. Bernhard."
|
||||
export WM_ARCH=darwinIntel
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
SunOS)
|
||||
WM_ARCH=SunOS64
|
||||
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'
|
||||
|
|
@ -206,7 +196,7 @@ SunOS)
|
|||
cat <<USAGE
|
||||
|
||||
Your "$WM_ARCH" operating system is not supported by this release
|
||||
of OpenFOAM. For further assistance, please contact www.openfoam.org
|
||||
of OpenFOAM. For further assistance, please contact www.OpenFOAM.org
|
||||
|
||||
USAGE
|
||||
;;
|
||||
|
|
|
|||
33
etc/cshrc
33
etc/cshrc
|
|
@ -2,7 +2,7 @@
|
|||
# ========= |
|
||||
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
||||
# \\ / O peration |
|
||||
# \\ / A nd | Copyright held by original author
|
||||
# \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd.
|
||||
# \\/ M anipulation |
|
||||
#------------------------------------------------------------------------------
|
||||
# License
|
||||
|
|
@ -32,12 +32,9 @@
|
|||
#------------------------------------------------------------------------------
|
||||
|
||||
setenv WM_PROJECT OpenFOAM
|
||||
setenv WM_PROJECT_VERSION 1.6-ext
|
||||
setenv WM_PROJECT_VERSION 1.6.x
|
||||
|
||||
# helps to easily write #ifdefs to detect a dev-version
|
||||
setenv FOAM_DEV 1
|
||||
|
||||
###############################################################################
|
||||
################################################################################
|
||||
# USER EDITABLE PART
|
||||
#
|
||||
# either setenv FOAM_INST_DIR before sourcing this file or set
|
||||
|
|
@ -51,7 +48,7 @@ set foamInstall = $HOME/$WM_PROJECT
|
|||
# set foamInstall = /opt/$WM_PROJECT
|
||||
#
|
||||
# END OF (NORMAL) USER EDITABLE PART
|
||||
###############################################################################
|
||||
################################################################################
|
||||
|
||||
# note the location for later use (eg, in job scripts)
|
||||
if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
|
||||
|
|
@ -89,8 +86,6 @@ setenv WM_COMPILER_LIB_ARCH
|
|||
|
||||
# Compilation options (architecture, precision, optimised, debug or profiling)
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
setenv WM_NCOMPPROCS 2
|
||||
|
||||
# WM_ARCH_OPTION = 32 | 64
|
||||
if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64
|
||||
|
||||
|
|
@ -98,13 +93,13 @@ if ( ! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64
|
|||
if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
|
||||
|
||||
# WM_COMPILE_OPTION = Opt | Debug | Prof
|
||||
#if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
|
||||
#setenv WM_COMPILE_OPTION Opt
|
||||
setenv WM_COMPILE_OPTION Debug
|
||||
if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
|
||||
|
||||
# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
|
||||
if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
|
||||
|
||||
setenv WM_NCOMPPROCS 2
|
||||
|
||||
|
||||
# Run options (floating-point signal handling and memory initialisation)
|
||||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
|
@ -129,6 +124,8 @@ case Linux:
|
|||
case 32:
|
||||
setenv WM_ARCH linux
|
||||
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'
|
||||
|
|
@ -137,6 +134,8 @@ case Linux:
|
|||
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'
|
||||
|
|
@ -157,19 +156,19 @@ case Linux:
|
|||
case mips64:
|
||||
setenv WM_ARCH SiCortex64
|
||||
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'
|
||||
setenv WM_MPLIB MPI
|
||||
;;
|
||||
case Darwin:
|
||||
setenv WM_ARCH darwin
|
||||
setenv WM_COMPILER
|
||||
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'
|
||||
|
|
@ -185,6 +184,8 @@ case Linux:
|
|||
case SunOS:
|
||||
setenv WM_ARCH SunOS64
|
||||
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'
|
||||
|
|
|
|||
Reference in a new issue