Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Aland, Sebastian
amdis
Commits
73afa800
Commit
73afa800
authored
Jan 19, 2010
by
Thomas Witkowski
Browse files
Code refactoring in parallelization part.
parent
7908ff20
Changes
4
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
73afa800
...
@@ -30,10 +30,10 @@
...
@@ -30,10 +30,10 @@
# the same distribution terms that you use for the rest of that program.
# the same distribution terms that you use for the rest of that program.
# A sed program that does not truncate output.
# A sed program that does not truncate output.
SED
=
"/bin/sed"
SED
=
"/
usr/
bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed
=
"/bin/sed -e 1s/^X//"
Xsed
=
"/
usr/
bin/sed -e 1s/^X//"
# The HP-UX ksh and POSIX shell print the target directory to stdout
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
# if CDPATH is set.
...
@@ -44,7 +44,7 @@ available_tags=" CXX F77"
...
@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG
# ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
deimos101
:
# Shell to use when invoking shell scripts.
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
SHELL
=
"/bin/sh"
...
@@ -66,12 +66,12 @@ fast_install=yes
...
@@ -66,12 +66,12 @@ fast_install=yes
# The host system.
# The host system.
host_alias
=
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
host_os
=
linux-gnu
# The build system.
# The build system.
build_alias
=
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
# An echo program that does not interpret backslashes.
...
@@ -82,25 +82,22 @@ AR="ar"
...
@@ -82,25 +82,22 @@ AR="ar"
AR_FLAGS
=
"cru"
AR_FLAGS
=
"cru"
# A C compiler.
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
# A language-specific compiler.
CC
=
"
g
cc"
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# Is the compiler the GNU C compiler?
# Is the compiler the GNU C compiler?
with_gcc
=
yes
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
# An ERE matcher.
EGREP
=
"grep -E"
EGREP
=
"grep -E"
# The linker used to build libraries.
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
# Whether we need hard or soft links.
LN_S
=
"ln -s"
LN_S
=
"ln -s"
...
@@ -174,7 +171,7 @@ dlopen_self=unknown
...
@@ -174,7 +171,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
no_builtin_flag
=
" -fno-builtin"
...
@@ -232,11 +229,11 @@ striplib="strip --strip-unneeded"
...
@@ -232,11 +229,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
predep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
predep_objects
=
""
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
postdep_objects
=
""
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
...
@@ -248,7 +245,7 @@ postdeps=""
...
@@ -248,7 +245,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# The library search path used internally by the compiler when linking
# a shared library.
# a shared library.
compiler_lib_search_path
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
compiler_lib_search_path
=
""
# Method to check whether dependent libraries are shared objects.
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
deplibs_check_method
=
"pass_all"
...
@@ -328,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
...
@@ -328,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat-linux/lib/i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat
-linux/lib/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
/lib/i386-redhat
-linux/4.1.2/ /lib/ /usr/lib/
i386-redhat
-linux/4.1.2/ /usr/lib/
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
" /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse-linux/lib/x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse
-linux/lib/
../lib64/
/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/ /lib/x86_64-suse
-linux/4.1.2/ /lib/
../lib64/
/usr/lib/
x86_64-suse
-linux/4.1.2/ /usr/lib/
../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/"
# Run-time system search path for libraries
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-2.9.9 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4/lib
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale
3.
0
/lib
/2.9.99 /opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2/libso
"
# Fix the shell variable $srcfile for the compiler.
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
fix_srcfile_path
=
""
...
@@ -6763,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
...
@@ -6763,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End:
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
deimos101
:
# Shell to use when invoking shell scripts.
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
SHELL
=
"/bin/sh"
...
@@ -6785,12 +6782,12 @@ fast_install=yes
...
@@ -6785,12 +6782,12 @@ fast_install=yes
# The host system.
# The host system.
host_alias
=
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
host_os
=
linux-gnu
# The build system.
# The build system.
build_alias
=
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
# An echo program that does not interpret backslashes.
...
@@ -6801,25 +6798,22 @@ AR="ar"
...
@@ -6801,25 +6798,22 @@ AR="ar"
AR_FLAGS
=
"cru"
AR_FLAGS
=
"cru"
# A C compiler.
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
# A language-specific compiler.
CC
=
"
g++
"
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC
"
# Is the compiler the GNU C compiler?
# Is the compiler the GNU C compiler?
with_gcc
=
yes
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
# An ERE matcher.
EGREP
=
"grep -E"
EGREP
=
"grep -E"
# The linker used to build libraries.
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
# Whether we need hard or soft links.
LN_S
=
"ln -s"
LN_S
=
"ln -s"
...
@@ -6893,7 +6887,7 @@ dlopen_self=unknown
...
@@ -6893,7 +6887,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
no_builtin_flag
=
" -fno-builtin"
...
@@ -6948,11 +6942,11 @@ striplib="strip --strip-unneeded"
...
@@ -6948,11 +6942,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
predep_objects
=
`
echo
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../crti.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtbeginS.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
predep_objects
=
"/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/
crti.o /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/crtbeginS.o"
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdep_objects
=
`
echo
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtendS.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
crtn.o"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
postdep_objects
=
"/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/crtendS.o /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/crtn.o"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
...
@@ -6960,11 +6954,11 @@ predeps=""
...
@@ -6960,11 +6954,11 @@ predeps=""
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdeps
=
"-lstdc++ -lm -lgcc_s -lc -lgcc_s"
postdeps
=
"
-lmpi_cxx -lmpi -lopen-rte -lopen-pal -libverbs -lrt -lnuma -ldl -lnsl -lutil -ldl
-lstdc++ -lm -lgcc_s
-lpthread
-lc -lgcc_s"
# The library search path used internally by the compiler when linking
# The library search path used internally by the compiler when linking
# a shared library.
# a shared library.
compiler_lib_search_path
=
`
echo
"
-L/usr/lib/gcc/
i386-redhat
-linux/4.1.2 -L/usr/lib/gcc/
i386-redhat
-linux/4.1.2
-L/usr/lib/gcc/i386-redhat-linux/4.1.2/../../.."
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
compiler_lib_search_path
=
"-L/usr/lib64 -L/licsoft/libraries/openmpi/1.2.6/64bit/lib
-L/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2 -L/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2
/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib -L/usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../.."
# Method to check whether dependent libraries are shared objects.
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
deplibs_check_method
=
"pass_all"
...
@@ -7044,10 +7038,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
...
@@ -7044,10 +7038,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat-linux/lib/i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../../
i386-redhat
-linux/lib/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
i386-redhat
-linux/4.1.2/ /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../
/lib/i386-redhat
-linux/4.1.2/ /lib/ /usr/lib/
i386-redhat
-linux/4.1.2/ /usr/lib/
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
" /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib/gcc/
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse-linux/lib/x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../../
x86_64-suse
-linux/lib/
../lib64/
/usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
x86_64-suse
-linux/4.1.2/ /usr/lib
64
/gcc/
x86_64-suse
-linux/4.1.2/../../../
../lib64/ /lib/x86_64-suse
-linux/4.1.2/ /lib/
../lib64/
/usr/lib/
x86_64-suse
-linux/4.1.2/ /usr/lib/
../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../ /lib/ /usr/lib/"
# Run-time system search path for libraries
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-2.9.9 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4/lib
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale
3.
0
/lib
/2.9.99 /opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2/libso
"
# Fix the shell variable $srcfile for the compiler.
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
fix_srcfile_path
=
""
...
@@ -7071,7 +7065,7 @@ include_expsyms=""
...
@@ -7071,7 +7065,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77
# ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
deimos101
:
# Shell to use when invoking shell scripts.
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
SHELL
=
"/bin/sh"
...
@@ -7093,12 +7087,12 @@ fast_install=yes
...
@@ -7093,12 +7087,12 @@ fast_install=yes
# The host system.
# The host system.
host_alias
=
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
host_os
=
linux-gnu
# The build system.
# The build system.
build_alias
=
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
# An echo program that does not interpret backslashes.
...
@@ -7109,7 +7103,7 @@ AR="ar"
...
@@ -7109,7 +7103,7 @@ AR="ar"
AR_FLAGS
=
"cru"
AR_FLAGS
=
"cru"
# A C compiler.
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
LTCFLAGS
=
"-g -O2"
...
@@ -7118,16 +7112,13 @@ LTCFLAGS="-g -O2"
...
@@ -7118,16 +7112,13 @@ LTCFLAGS="-g -O2"
CC
=
"g77"
CC
=
"g77"
# Is the compiler the GNU C compiler?
# Is the compiler the GNU C compiler?
with_gcc
=
yes
with_gcc
=
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
# An ERE matcher.
EGREP
=
"grep -E"
EGREP
=
"grep -E"
# The linker used to build libraries.
# The linker used to build libraries.
LD
=
"/usr/
bin/ld
"
LD
=
"/usr/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
# Whether we need hard or soft links.
# Whether we need hard or soft links.
LN_S
=
"ln -s"
LN_S
=
"ln -s"
...
@@ -7259,11 +7250,11 @@ striplib="strip --strip-unneeded"
...
@@ -7259,11 +7250,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
predep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
predep_objects
=
""
# Dependencies to place after the objects being linked to create a
# Dependencies to place after the objects being linked to create a
# shared library.
# shared library.
postdep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
postdep_objects
=
""
# Dependencies to place before the objects being linked to create a
# Dependencies to place before the objects being linked to create a
# shared library.
# shared library.
...
@@ -7275,7 +7266,7 @@ postdeps=""
...
@@ -7275,7 +7266,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# The library search path used internally by the compiler when linking
# a shared library.
# a shared library.
compiler_lib_search_path
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
compiler_lib_search_path
=
""
# Method to check whether dependent libraries are shared objects.
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
deplibs_check_method
=
"pass_all"
...
@@ -7355,10 +7346,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
...
@@ -7355,10 +7346,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /usr/lib/gcc
/i386-redhat
-linux/3.
4.6
/ /usr/lib/gcc/
i386-redhat
-linux/3.
4.6
/ /usr/lib/gcc
/i386-redhat
-linux/3.
4.6
/../../../../
i386-redhat-linux/lib/i386-redhat
-linux/3.
4.6
/ /usr/lib/gcc
/i386-redhat
-linux/3.
4.6
/../../../../
i386-redhat
-linux/lib/ /usr/lib/gcc
/i386-redhat
-linux/3.
4.6
/../../../
i386-redhat
-linux/3.
4.6
/ /usr/lib/gcc
/i386-redhat
-linux/3.
4.6
/../../../ /lib/
i386-redhat
-linux/3.
4.6
/ /lib/ /usr/lib/
i386-redhat
-linux/3.
4.6
/ /usr/lib/"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
sys_lib_search_path_spec
=
" /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/3.
3.5
/ /usr/lib/gcc/
x86_64-suse
-linux/3.
3.5
/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/3.
3.5
/../../../../
x86_64-suse-linux/lib/x86_64-suse
-linux/3.
3.5
/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/3.
3.5
/../../../../
x86_64-suse
-linux/lib/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/3.
3.5
/../../../
x86_64-suse
-linux/3.
3.5
/ /usr/lib
64
/gcc
-lib/x86_64-suse
-linux/3.
3.5
/../../../ /lib/
x86_64-suse
-linux/3.
3.5
/ /lib/ /usr/lib/
x86_64-suse
-linux/3.
3.5
/ /usr/lib/"
# Run-time system search path for libraries
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-2.9.9 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4/lib
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
X11R6/lib64/Xaw3d /usr/X11R6/lib64 /usr/X11R6/lib/Xaw3d /usr/X11R6/lib /usr/x86_64-suse-linux/lib /usr/local/lib64 /usr/local/lib /opt/kde3/lib64 /opt/kde3/lib /opt/gnome/lib64 /opt/gnome/lib /lib64 /lib /usr/lib64 /usr/lib /opt/cluster/intel/cce/9.1.042/lib /opt/cluster/intel/fce/9.1.036/lib /opt/cluster/Pathscale
3.
0
/lib
/2.9.99 /opt/cluster/Pathscale3.0/lib/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2/libso
"
# Fix the shell variable $srcfile for the compiler.
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
fix_srcfile_path
=
""
...
...
AMDiS/src/BoundaryManager.cc
View file @
73afa800
...
@@ -57,6 +57,7 @@ namespace AMDiS {
...
@@ -57,6 +57,7 @@ namespace AMDiS {
std
::
vector
<
DegreeOfFreedom
>
&
dofVec
=
dofIndices
[
omp_get_thread_num
()];
std
::
vector
<
DegreeOfFreedom
>
&
dofVec
=
dofIndices
[
omp_get_thread_num
()];
const
BasisFunction
*
basisFcts
=
feSpace
->
getBasisFcts
();
const
BasisFunction
*
basisFcts
=
feSpace
->
getBasisFcts
();
int
nBasFcts
=
basisFcts
->
getNumber
();
int
nBasFcts
=
basisFcts
->
getNumber
();
dofVec
.
resize
(
nBasFcts
);
// get boundaries of all DOFs
// get boundaries of all DOFs
BoundaryType
*
localBound
=
localBounds
[
omp_get_thread_num
()];
BoundaryType
*
localBound
=
localBounds
[
omp_get_thread_num
()];
...
@@ -88,7 +89,8 @@ namespace AMDiS {
...
@@ -88,7 +89,8 @@ namespace AMDiS {
std
::
vector
<
DegreeOfFreedom
>
&
dofVec
=
dofIndices
[
omp_get_thread_num
()];
std
::
vector
<
DegreeOfFreedom
>
&
dofVec
=
dofIndices
[
omp_get_thread_num
()];
const
BasisFunction
*
basisFcts
=
feSpace
->
getBasisFcts
();
const
BasisFunction
*
basisFcts
=
feSpace
->
getBasisFcts
();
int
nBasFcts
=
basisFcts
->
getNumber
();
int
nBasFcts
=
basisFcts
->
getNumber
();
dofVec
.
resize
(
nBasFcts
);
// get boundaries of all DOFs
// get boundaries of all DOFs
BoundaryType
*
localBound
=
localBounds
[
omp_get_thread_num
()];
BoundaryType
*
localBound
=
localBounds
[
omp_get_thread_num
()];
basisFcts
->
getBound
(
elInfo
,
localBound
);
basisFcts
->
getBound
(
elInfo
,
localBound
);
...
...
AMDiS/src/ParallelDomainBase.cc
View file @
73afa800
...
@@ -798,8 +798,6 @@ namespace AMDiS {
...
@@ -798,8 +798,6 @@ namespace AMDiS {
// === Because the mesh has been changed, update the DOF numbering and mappings. ===
// === Because the mesh has been changed, update the DOF numbering and mappings. ===
updateLocalGlobalNumbering
();
updateLocalGlobalNumbering
();
exit
(
0
);
}
}
...
@@ -816,10 +814,6 @@ namespace AMDiS {
...
@@ -816,10 +814,6 @@ namespace AMDiS {
boundIt
!=
it
->
second
.
end
();
++
boundIt
)
{
boundIt
!=
it
->
second
.
end
();
++
boundIt
)
{
MeshStructure
elCode
;
MeshStructure
elCode
;
elCode
.
init
(
boundIt
->
rankObj
);
elCode
.
init
(
boundIt
->
rankObj
);
// elCode.init(boundIt->rankObj.el,
// boundIt->rankObj.ithObj,
// boundIt->rankObj.elType,
// boundIt->rankObj.reverseMode);
sendCodes
[
it
->
first
].
push_back
(
elCode
);
sendCodes
[
it
->
first
].
push_back
(
elCode
);
}
}
}
}
...
@@ -844,10 +838,6 @@ namespace AMDiS {
...
@@ -844,10 +838,6 @@ namespace AMDiS {
MeshStructure
elCode
;
MeshStructure
elCode
;
elCode
.
init
(
boundIt
->
rankObj
);
elCode
.
init
(
boundIt
->
rankObj
);
// elCode.init(boundIt->rankObj.el,
// boundIt->rankObj.ithObj,
// boundIt->rankObj.elType,
// boundIt->rankObj.reverseMode);
if
(
elCode
.
getCode
()
!=
recvCodes
[
i
].
getCode
())
{
if
(
elCode
.
getCode
()
!=
recvCodes
[
i
].
getCode
())
{
TEST_EXIT_DBG
(
refineManager
)(
"Refinement manager is not set correctly!
\n
"
);
TEST_EXIT_DBG
(
refineManager
)(
"Refinement manager is not set correctly!
\n
"
);
...
@@ -1526,10 +1516,10 @@ namespace AMDiS {
...
@@ -1526,10 +1516,10 @@ namespace AMDiS {
boundIt
->
rankObj
.
elType
,
boundIt
->
rankObj
.
elType
,
dofs
,
dofs
,
boundIt
->
rankObj
.
reverseMode
);
boundIt
->
rankObj
.
reverseMode
);
//
boundIt->rankObj.el->getNonVertexDofs(feSpace,
boundIt
->
rankObj
.
el
->
getNonVertexDofs
(
feSpace
,
//
boundIt->rankObj.ithObj,
boundIt
->
rankObj
.
ithObj
,
//
boundIt->rankObj.elType,
boundIt
->
rankObj
.
elType
,
//
dofs);
dofs
);
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
dofs
.
size
());
i
++
)
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
dofs
.
size
());
i
++
)
dofsToSend
.
push_back
(
dofs
[
i
]);
dofsToSend
.
push_back
(
dofs
[
i
]);
...
@@ -1545,10 +1535,10 @@ namespace AMDiS {
...
@@ -1545,10 +1535,10 @@ namespace AMDiS {
boundIt
!=
it
->
second
.
end
();
++
boundIt
)
{
boundIt
!=
it
->
second
.
end
();
++
boundIt
)
{
DofContainer
dofs
;
DofContainer
dofs
;
//
boundIt->rankObj.el->getNonVertexDofs(feSpace,
boundIt
->
rankObj
.
el
->
getNonVertexDofs
(
feSpace
,
//
boundIt->rankObj.ithObj,
boundIt
->
rankObj
.
ithObj
,
//
boundIt->rankObj.elType,
boundIt
->
rankObj
.
elType
,
//
dofs);
dofs
);
boundIt
->
rankObj
.
el
->
getVertexDofs
(
feSpace
,
boundIt
->
rankObj
.
el
->
getVertexDofs
(
feSpace
,
boundIt
->
rankObj
.
ithObj
,
boundIt
->
rankObj
.
ithObj
,
boundIt
->
rankObj
.
elType
,
boundIt
->
rankObj
.
elType
,
...
...
AMDiS/src/Tetrahedron.cc
View file @
73afa800
...
@@ -180,13 +180,6 @@ namespace AMDiS {
...
@@ -180,13 +180,6 @@ namespace AMDiS {
{
{
FUNCNAME
(
"Tetrahedron::getVertexDofs()"
);
FUNCNAME
(
"Tetrahedron::getVertexDofs()"
);
bool
p
=
false
;
// if (MPI::COMM_WORLD.Get_rank() == 0)
// p = true;
if
(
p
)
MSG
(
"GET-VD: idx=%d ith=%d type=%d
\n
"
,
this
->
getIndex
(),
ith
,
elType
);
if
(
parentVertices
)
{
if
(
parentVertices
)
{
switch
(
ith
)
{
switch
(
ith
)
{
case
0
:
case
0
:
...
@@ -245,9 +238,6 @@ namespace AMDiS {
...
@@ -245,9 +238,6 @@ namespace AMDiS {
int
c1
=
sideOfChild
[
elType
][
0
][
ith
];
int
c1
=
sideOfChild
[
elType
][
0
][
ith
];
int
c2
=
sideOfChild
[
elType
][
1
][
ith
];
int
c2
=
sideOfChild
[
elType
][
1
][
ith
];
if
(
p
)
MSG
(
"GO TO CHILD WITH SIDE %d %d
\n
"
,
c1
,
c2
);
if
(
c1
==
-
1
||
c2
==
-
1
)
{
if
(
c1
==
-
1
||
c2
==
-
1
)
{
std
::
cout
<<
"ERROR 3 WITH elType = "
<<
elType
<<
std
::
endl
;
std
::
cout
<<
"ERROR 3 WITH elType = "
<<
elType
<<
std
::
endl
;
exit
(
0
);
exit
(
0
);
...
@@ -262,9 +252,6 @@ namespace AMDiS {
...
@@ -262,9 +252,6 @@ namespace AMDiS {
dofs
.
push_back
(
child
[
0
]
->
getDOF
(
3
));
dofs
.
push_back
(
child
[
0
]
->
getDOF
(
3
));
child
[
1
]
->
getVertexDofs
(
feSpace
,
c2
,
(
elType
+
1
)
%
3
,
dofs
,
false
);
child
[
1
]
->
getVertexDofs
(
feSpace
,
c2
,
(
elType
+
1
)
%
3
,
dofs
,
false
);
}
}
}
else
{
if
(
p
)
MSG
(
"NO CHILD
\n
"
);
}
}
}
}
break
;
break
;
...
@@ -296,8 +283,10 @@ namespace AMDiS {
...
@@ -296,8 +283,10 @@ namespace AMDiS {
elDofIter
.
reset
(
this
);
elDofIter
.
reset
(
this
);
do
{
do
{
if
(
elDofIter
.
getCurrentPos
()
==
2
&&
if
(
elDofIter
.
getCurrentPos
()
==
2
&&
elDofIter
.
getCurrentElementPos
()
==
ith
)
elDofIter
.
getCurrentElementPos
()
==
ith
)
{
dofs
.
push_back
(
elDofIter
.
getDofPtr
());
ERROR_EXIT
(
"Check this, if it will really work!
\n
"
);
dofs
.
push_back
(
elDofIter
.
getDofPtr
());
}
}
while
(
elDofIter
.
next
());
}
while
(
elDofIter
.
next
());
}
}
}
}
...
...
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