Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openfoam
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
openfoam
Commits
f3ab304d
Commit
f3ab304d
authored
15 years ago
by
Mark Olesen
Browse files
Options
Downloads
Patches
Plain Diff
ENH: simplify compiler settings, provision for boost/CGAL
parent
8fe5f7f9
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
etc/bashrc
+1
-1
1 addition, 1 deletion
etc/bashrc
etc/cshrc
+1
-1
1 addition, 1 deletion
etc/cshrc
etc/settings.csh
+83
-30
83 additions, 30 deletions
etc/settings.csh
etc/settings.sh
+76
-37
76 additions, 37 deletions
etc/settings.sh
with
161 additions
and
69 deletions
etc/bashrc
+
1
−
1
View file @
f3ab304d
...
...
@@ -159,7 +159,7 @@ Linux)
export
WM_LDFLAGS
=
'-m64'
;;
*
)
echo
Unknown WM_ARCH_OPTION
$WM_ARCH_OPTION
, should be 32 or 64
echo
"
Unknown WM_ARCH_OPTION
'
$WM_ARCH_OPTION
'
, should be 32 or 64
"
;;
esac
;;
...
...
This diff is collapsed.
Click to expand it.
etc/cshrc
+
1
−
1
View file @
f3ab304d
...
...
@@ -149,7 +149,7 @@ case Linux:
breaksw
default:
echo
Unknown WM_ARCH_OPTION
$WM_ARCH_OPTION
, should be 32 or 64
echo
"
Unknown WM_ARCH_OPTION
'
$WM_ARCH_OPTION
'
, should be 32 or 64
"
breaksw
endsw
...
...
This diff is collapsed.
Click to expand it.
etc/settings.csh
+
83
−
30
View file @
f3ab304d
...
...
@@ -74,6 +74,11 @@ _foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}
# Make sure to pick up dummy versions of external libraries last
_foamAddLib
${
FOAM_USER_LIBBIN
}
:
${
FOAM_SITE_LIBBIN
}
:
${
FOAM_LIBBIN
}
:
${
FOAM_LIBBIN
}
/dummy
# Compiler settings
# ~~~~~~~~~~~~~~~~~
unset
gcc_version gmp_version mpfr_version
unsetenv MPFR_ARCH_PATH
# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -84,40 +89,95 @@ switch ("$compilerInstall")
case
OpenFOAM:
switch
(
"
$WM_COMPILER
"
)
case
Gcc:
setenv WM_COMPILER_DIR
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gcc-4.4.3
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/mpfr-2.4.2/lib
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gmp-5.0.1/lib
breaksw
set
gcc_version
=
gcc-4.4.3
set
gmp_version
=
gmp-5.0.1
set
mpfr_version
=
mpfr-2.4.2
breaksw
case
Gcc442:
setenv WM_COMPILER_DIR
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gcc-4.4.2
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/mpfr-2.4.1/lib
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gmp-4.2.4/lib
breaksw
set
gcc_version
=
gcc-4.4.2
set
gmp_version
=
gmp-4.2.4
set
mpfr_version
=
mpfr-2.4.1
breaksw
case
Gcc44:
set
gcc_version
=
gcc-4.4.2
set
gmp_version
=
gmp-4.2.4
set
mpfr_version
=
mpfr-2.4.1
breaksw
case
Gcc43:
setenv WM_COMPILER_DIR
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gcc-4.3.3
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/mpfr-2.4.1/lib
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gmp-4.2.4/lib
breaksw
endsw
set
gcc_version
=
gcc-4.3.3
set
gmp_version
=
gmp-4.2.4
set
mpfr_version
=
mpfr-2.4.1
breaksw
# Check that the compiler directory can be found
if
(
!
-d
"
$WM_COMPILER_DIR
"
)
then
default:
echo
echo
"Warning in
$WM_PROJECT_DIR
/etc/settings.csh:"
echo
" Cannot find
$WM_COMPILER_DIR
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
" Unknown OpenFOAM compiler type '
$WM_COMPILER
'"
echo
" Please check your settings"
echo
endif
breaksw
_foamAddPath
${
WM_COMPILER_DIR
}
/bin
_foamAddLib
${
WM_COMPILER_DIR
}
/lib
${
WM_COMPILER_LIB_ARCH
}
:
${
WM_COMPILER_DIR
}
/lib
_foamAddMan
${
WM_COMPILER_DIR
}
/man
endsw
if
(
$?
gcc_version
)
then
set
gccDir
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
$gcc_version
set
gmpDir
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
$gmp_version
set
mpfrDir
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
$mpfr_version
# Check that the compiler directory can be found
if
(
!
-d
"
$gccDir
"
)
then
echo
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
endif
_foamAddMan
$gccDir
/man
_foamAddPath
$gccDir
/bin
_foamAddLib
$gccDir
/lib
${
WM_COMPILER_LIB_ARCH
}
:
$gccDir
/lib
# add in gmp/mpfr libraries
_foamAddLib
$gmpDir
/lib
_foamAddLib
$mpfrDir
/lib
# used by boost/CGAL:
setenv MPFR_ARCH_PATH
$mpfrDir
endif
unset
gcc_version gccDir gmp_version gmpDir mpfr_version mpfrDir
breaksw
endsw
# boost and CGAL
# ~~~~~~~~~~~~~~
set
boost_version
=
boost_1_42_0
set
cgal_version
=
CGAL-3.5.1
setenv BOOST_ARCH_PATH
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$boost_version
setenv CGAL_ARCH_PATH
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$cgal_version
# enabled if CGAL is available
if
(
-d
"
$CGAL_ARCH_PATH
"
)
then
if
(
-d
"
$BOOST_ARCH_PATH
"
)
then
_foamAddLib
$BOOST_ARCH_PATH
/lib
else
unsetenv BOOST_ARCH_PATH
endif
_foamAddLib
$CGAL_ARCH_PATH
/lib
else
unsetenv BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH
endif
unset
boost_version cgal_version
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -259,17 +319,10 @@ else
endif
# CGAL library if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~
if
(
$?
CGAL_LIB_DIR
)
then
_foamAddLib
$CGAL_LIB_DIR
endif
# Enable the hoard memory allocator if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#if ( -f $FOAM_LIBBIN/libhoard.so ) then
# setenv LD_PRELOAD $FOAM_LIBBIN/libhoard.so:$
{
LD_PRELOAD
}
# setenv LD_PRELOAD $FOAM_LIBBIN/libhoard.so:$LD_PRELOAD
#endif
...
...
This diff is collapsed.
Click to expand it.
etc/settings.sh
+
76
−
37
View file @
f3ab304d
...
...
@@ -98,10 +98,9 @@ _foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN
# Make sure to pick up dummy versions of external libraries last
_foamAddLib
$FOAM_USER_LIBBIN
:
$FOAM_SITE_LIBBIN
:
$FOAM_LIBBIN
:
$FOAM_LIBBIN
/dummy
# Compiler settings
# ~~~~~~~~~~~~~~~~~
unset
compilerBin compilerLib compilerMan
unset
gcc_version gmp_version mpfr_version MPFR_ARCH_PATH
# Select compiler installation
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -112,52 +111,97 @@ case "${compilerInstall:-OpenFOAM}" in
OpenFOAM
)
case
"
$WM_COMPILER
"
in
Gcc
)
export
WM_COMPILER_DIR
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
gcc-4.4.3
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/mpfr-2.4.2/lib
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gmp-5.0.1/lib
gcc_version
=
gcc-4.4.3
gmp_version
=
gmp-5.0.1
mpfr_version
=
mpfr-2.4.2
;;
Gcc442
)
export
WM_COMPILER_DIR
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
gcc-4.4.2
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/mpfr-2.4.1/lib
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gmp-4.2.4/lib
gcc_version
=
gcc-4.4.2
gmp_version
=
gmp-4.2.4
mpfr_version
=
mpfr-2.4.1
;;
Gcc44
)
export
WM_COMPILER_DIR
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
gcc-4.4.2
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/mpfr-2.4.1/lib
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gmp-4.2.4/lib
gcc_version
=
gcc-4.4.2
gmp_version
=
gmp-4.2.4
mpfr_version
=
mpfr-2.4.1
;;
Gcc43
)
export
WM_COMPILER_DIR
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
gcc-4.3.3
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/mpfr-2.4.1/lib
_foamAddLib
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gmp-4.2.4/lib
gcc_version
=
gcc-4.3.3
gmp_version
=
gmp-4.2.4
mpfr_version
=
mpfr-2.4.1
;;
esac
# Check that the compiler directory can be found
if
[
!
-d
"
$WM_COMPILER_DIR
"
]
then
*
)
echo
echo
"Warning in
$WM_PROJECT_DIR
/etc/settings.sh:"
echo
" Cannot find
$WM_COMPILER_DIR
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
" Unknown OpenFOAM compiler type '
$WM_COMPILER
'"
echo
" Please check your settings"
echo
fi
;;
esac
compilerBin
=
$WM_COMPILER_DIR
/bin
compilerLib
=
$WM_COMPILER_DIR
/lib
$WM_COMPILER_LIB_ARCH
:
$WM_COMPILER_DIR
/lib
compilerMan
=
$WM_COMPILER_DIR
/man
if
[
-n
"
$gcc_version
"
]
then
gccDir
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
$gcc_version
gmpDir
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
$gmp_version
mpfrDir
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/
$mpfr_version
# Check that the compiler directory can be found
[
-d
"
$gccDir
"
]
||
{
echo
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
}
_foamAddMan
$gccDir
/man
_foamAddPath
$gccDir
/bin
_foamAddLib
$gccDir
/lib
# 64-bit needs lib64, but 32-bit needs lib (not lib32)
if
[
"
$WM_ARCH_OPTION
"
=
64
]
then
_foamAddLib
$gccDir
/lib
$WM_COMPILER_LIB_ARCH
fi
# add in gmp/mpfr libraries
_foamAddLib
$gmpDir
/lib
_foamAddLib
$mpfrDir
/lib
# used by boost/CGAL:
export
MPFR_ARCH_PATH
=
$mpfrDir
fi
unset
gcc_version gccDir gmp_version gmpDir mpfr_version mpfrDir
;;
esac
if
[
-d
"
$compilerBin
"
]
# boost and CGAL
# ~~~~~~~~~~~~~~
boost_version
=
boost_1_42_0
cgal_version
=
CGAL-3.5.1
export
BOOST_ARCH_PATH
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$boost_version
export
CGAL_ARCH_PATH
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$cgal_version
# enabled if CGAL is available
if
[
-d
"
$CGAL_ARCH_PATH
"
]
then
_foamAddPath
$compilerBin
_foamAddLib
$compilerLib
_foamAddMan
$compilerMan
if
[
-d
"
$BOOST_ARCH_PATH
"
]
then
_foamAddLib
$BOOST_ARCH_PATH
/lib
else
unset
BOOST_ARCH_PATH
fi
_foamAddLib
$CGAL_ARCH_PATH
/lib
else
unset
BOOST_ARCH_PATH CGAL_ARCH_PATH MPFR_ARCH_PATH
fi
unset
compilerBin compilerLib compilerMan compilerInstall
unset
boost_version cgal_version
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -301,11 +345,6 @@ fi
export
MPI_BUFFER_SIZE
# CGAL library if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~
[
-d
"
$CGAL_LIB_DIR
"
]
&&
_foamAddLib
$CGAL_LIB_DIR
# Enable the hoard memory allocator if available
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
#if [ -f $FOAM_LIBBIN/libhoard.so ]
...
...
@@ -316,6 +355,6 @@ export MPI_BUFFER_SIZE
# cleanup environment:
# ~~~~~~~~~~~~~~~~~~~~
unset
_foamAddPath _foamAddLib _foamAddMan minBufferSize
unset
_foamAddPath _foamAddLib _foamAddMan
compilerInstall
minBufferSize
# ----------------------------------------------------------------- end-of-file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment