Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
d978c79e
Commit
d978c79e
authored
Mar 19, 2010
by
Mark Olesen
Browse files
STYLE: drop unneeded MPI_HOME for openmpi (uses OPAL_PREFIX)
COMP: drop gcc-4.2 settings
parent
01f8538e
Changes
3
Hide whitespace changes
Inline
Side-by-side
etc/settings.csh
View file @
d978c79e
...
...
@@ -97,9 +97,6 @@ case OpenFOAM:
_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
case
Gcc42:
setenv WM_COMPILER_DIR
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gcc-4.2.4
breaksw
endsw
# Check that the compiler directory can be found
...
...
@@ -123,12 +120,11 @@ endsw
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
unsetenv MPI_ARCH_PATH
unsetenv MPI_ARCH_PATH
MPI_HOME
switch
(
"
$WM_MPLIB
"
)
case
OPENMPI:
set
mpi_version
=
openmpi-1.4.1
setenv MPI_HOME
$WM_THIRD_PARTY_DIR
/
$mpi_version
setenv MPI_ARCH_PATH
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$mpi_version
# Tell OpenMPI where to find its install directory
...
...
etc/settings.sh
View file @
d978c79e
...
...
@@ -130,9 +130,6 @@ OpenFOAM)
_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
;;
Gcc42
)
export
WM_COMPILER_DIR
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER_ARCH
/gcc-4.2.4
;;
esac
# Check that the compiler directory can be found
...
...
@@ -164,12 +161,11 @@ unset compilerBin compilerLib compilerMan compilerInstall
# Communications library
# ~~~~~~~~~~~~~~~~~~~~~~
unset
MPI_ARCH_PATH
unset
MPI_ARCH_PATH
MPI_HOME
case
"
$WM_MPLIB
"
in
OPENMPI
)
mpi_version
=
openmpi-1.4.1
export
MPI_HOME
=
$WM_THIRD_PARTY_DIR
/
$mpi_version
export
MPI_ARCH_PATH
=
$WM_THIRD_PARTY_DIR
/platforms/
$WM_ARCH$WM_COMPILER
/
$mpi_version
# Tell OpenMPI where to find its install directory
...
...
src/parallel/decompose/Allwmake
View file @
d978c79e
...
...
@@ -9,7 +9,7 @@ wmake libso metisDecomp
if
[
-d
"
$FOAM_MPI_LIBBIN
"
]
then
(
WM_OPTIONS
=
${
WM_OPTIONS
}
$WM_MPLIB
;
wmake libso parMetisDecomp
)
WM_OPTIONS
=
${
WM_OPTIONS
}
$WM_MPLIB
wmake libso parMetisDecomp
fi
wmake libso decompositionMethods
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment