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
db890e76
Commit
db890e76
authored
May 21, 2010
by
Thomas Witkowski
Browse files
A lot of bugfixes in parallel code.
parent
133e3a02
Changes
22
Expand all
Hide whitespace changes
Inline
Side-by-side
AMDiS/Makefile.in
View file @
db890e76
...
...
@@ -140,7 +140,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR
=
@PATH_SEPARATOR@
PETSC_DIR
=
@PETSC_DIR@
RANLIB
=
@RANLIB@
SED
=
@SED@
SET_MAKE
=
@SET_MAKE@
SHELL
=
@SHELL@
STRIP
=
@STRIP@
...
...
AMDiS/aclocal.m4
View file @
db890e76
...
...
@@ -1578,27 +1578,10 @@ linux*)
# before this can be enabled.
hardcode_into_libs=yes
# find out which ABI we are using
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
echo '[#]line __oline__ "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*64-bit*)
libsuff=64
sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
;;
esac
fi
rm -rf conftest*
;;
esac
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
2>/dev/null
", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib
${libsuff} /usr/lib${libsuff}
$lt_ld_extra"
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="/lib
/usr/lib
$lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
...
...
@@ -4305,9 +4288,6 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
# Is the compiler the GNU C compiler?
with_gcc=$_LT_AC_TAGVAR(GCC, $1)
gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
gcc_ver=\`gcc -dumpversion\`
# An ERE matcher.
EGREP=$lt_EGREP
...
...
@@ -4441,11 +4421,11 @@ striplib=$lt_striplib
# Dependencies to place before the objects being linked to create a
# shared library.
predep_objects=
\`echo
$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
| \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
# Dependencies to place after the objects being linked to create a
# shared library.
postdep_objects=
\`echo
$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
| \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
# Dependencies to place before the objects being linked to create a
# shared library.
...
...
@@ -4457,7 +4437,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=
\`echo
$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
| \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
...
...
@@ -4537,7 +4517,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
# Compile-time system search path for libraries
sys_lib_search_path_spec=
\`echo
$lt_sys_lib_search_path_spec
| \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
...
...
@@ -6373,7 +6353,6 @@ do
done
done
done
IFS=$as_save_IFS
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
...
...
@@ -6406,7 +6385,6 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
done
])
SED=$lt_cv_path_SED
AC_SUBST([SED])
AC_MSG_RESULT([$SED])
])
...
...
AMDiS/bin/Makefile.in
View file @
db890e76
...
...
@@ -420,7 +420,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR
=
@PATH_SEPARATOR@
PETSC_DIR
=
@PETSC_DIR@
RANLIB
=
@RANLIB@
SED
=
@SED@
SET_MAKE
=
@SET_MAKE@
SHELL
=
@SHELL@
STRIP
=
@STRIP@
...
...
AMDiS/configure
View file @
db890e76
This diff is collapsed.
Click to expand it.
AMDiS/libtool
View file @
db890e76
...
...
@@ -30,10 +30,10 @@
# the same distribution terms that you use for the rest of that program.
# 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.
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
# if CDPATH is set.
...
...
@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
p2q081
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -66,12 +66,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -82,25 +82,22 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
# 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?
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
EGREP
=
"grep -E"
# 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.
LN_S
=
"ln -s"
...
...
@@ -174,7 +171,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
...
...
@@ -232,11 +229,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# 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
# 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
# shared library.
...
...
@@ -248,7 +245,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# 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.
deplibs_check_method
=
"pass_all"
...
...
@@ -328,10 +325,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /u/witkowski/local/lib/i386-redhat
-linux/4.1.2/ /
u/witkowski
/local/lib/ /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
=
" /fastfs/wir/local/lib/x86_64-suse
-linux/4.1.2/ /
fastfs/wir
/local/lib/
../lib64/
/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/../../../
..
/lib
64/ /lib/x86_64-suse
-linux/4.1.2/ /lib/
../lib64/
/usr/lib/
x86_64-suse
-linux/4.1.2/ /usr/lib/
../lib64/ /fastfs/wir/local/lib/ /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
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_srcfile_path
=
""
...
...
@@ -6763,7 +6760,7 @@ build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
p2q081
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -6785,12 +6782,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -6801,25 +6798,22 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
# A language-specific compiler.
CC
=
"
g++
"
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC
"
# Is the compiler the GNU C compiler?
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
# An ERE matcher.
EGREP
=
"grep -E"
# 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.
LN_S
=
"ln -s"
...
...
@@ -6893,7 +6887,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
link_static_flag
=
"
-static
"
link_static_flag
=
""
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
...
...
@@ -6948,11 +6942,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# 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
# 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
# shared library.
...
...
@@ -6960,11 +6954,11 @@ predeps=""
# Dependencies to place after the objects being linked to create a
# 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
# a shared library.
compiler_lib_search_path
=
`
echo
"-L/u/witkowski/local
/lib -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/fastfs/wir/local/lib -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.
deplibs_check_method
=
"pass_all"
...
...
@@ -7044,10 +7038,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /u/witkowski/local/lib/i386-redhat
-linux/4.1.2/ /
u/witkowski
/local/lib/ /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
=
" /fastfs/wir/local/lib/x86_64-suse
-linux/4.1.2/ /
fastfs/wir
/local/lib/
../lib64/
/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/../../../
..
/lib
64/ /lib/x86_64-suse
-linux/4.1.2/ /lib/
../lib64/
/usr/lib/
x86_64-suse
-linux/4.1.2/ /usr/lib/
../lib64/ /fastfs/wir/local/lib/ /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
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_srcfile_path
=
""
...
...
@@ -7071,7 +7065,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host
NWRW15
:
# Libtool was configured on host
p2q081
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -7093,12 +7087,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
i686-pc
-linux-gnu
host
=
x86_64-unknown
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
i686-pc
-linux-gnu
build
=
x86_64-unknown
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -7109,7 +7103,7 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
g
cc"
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
...
...
@@ -7118,16 +7112,13 @@ LTCFLAGS="-g -O2"
CC
=
"g77"
# Is the compiler the GNU C compiler?
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
| /bin/sed
's,/\.$,,'
`
gcc_ver
=
`
gcc
-dumpversion
`
with_gcc
=
# An ERE matcher.
EGREP
=
"grep -E"
# 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.
LN_S
=
"ln -s"
...
...
@@ -7259,11 +7250,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# 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
# 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
# shared library.
...
...
@@ -7275,7 +7266,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# 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.
deplibs_check_method
=
"pass_all"
...
...
@@ -7355,10 +7346,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs
=
unknown
# Compile-time system search path for libraries
sys_lib_search_path_spec
=
`
echo
" /u/witkowski/local/lib/i386-redhat-linux/3.4.6/ /u/witkowski
/local/lib/ /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
=
" /fastfs/wir/local/lib/x86_64-suse-linux/3.3.5/ /fastfs/wir
/local/lib/ /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
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_srcfile_path
=
""
...
...
AMDiS/src/Debug.cc
View file @
db890e76
...
...
@@ -77,6 +77,23 @@ namespace AMDiS {
}
void
highlightElementIndexMesh
(
FiniteElemSpace
*
feSpace
,
int
idx
,
std
::
string
filename
)
{
std
::
map
<
int
,
double
>
vec
;
TraverseStack
stack
;
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
feSpace
->
getMesh
(),
-
1
,
Mesh
::
CALL_LEAF_EL
);
while
(
elInfo
)
{
int
index
=
elInfo
->
getElement
()
->
getIndex
();
vec
[
index
]
=
(
index
==
idx
?
1.0
:
0.0
);
elInfo
=
stack
.
traverseNext
(
elInfo
);
}
ElementFileWriter
::
writeFile
(
vec
,
feSpace
,
filename
);
}
void
colorDofVectorByLocalElementDofs
(
DOFVector
<
double
>&
vec
,
Element
*
el
)
{
// === Get local indices of the given element. ===
...
...
@@ -121,12 +138,12 @@ namespace AMDiS {
TraverseStack
stack
;
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
feSpace
->
getMesh
(),
-
1
,
Mesh
::
CALL_
EVERY_EL_PREORDER
);
Mesh
::
CALL_
LEAF_EL
);
while
(
elInfo
)
{
basFcts
->
getLocalIndices
(
elInfo
->
getElement
(),
feSpace
->
getAdmin
(),
dofVec
);
for
(
int
i
=
0
;
i
<
nBasFcts
;
i
++
)
if
(
dofVec
[
i
]
==
dof
)
return
elInfo
->
getElement
();
return
elInfo
->
getElement
();
elInfo
=
stack
.
traverseNext
(
elInfo
);
}
...
...
@@ -155,7 +172,7 @@ namespace AMDiS {
Element
*
el
=
getDofIndexElement
(
feSpace
,
dof
);
Element
*
parEl
=
getLevel0ParentElement
(
feSpace
->
getMesh
(),
el
);
std
::
cout
<<
"DOF-INFO: dof = "
<<
dof
std
::
cout
<<
"
[DBG]
DOF-INFO: dof = "
<<
dof
<<
" elidx = "
<<
el
->
getIndex
()
<<
" pelidx = "
<<
parEl
->
getIndex
()
<<
std
::
endl
;
...
...
@@ -164,8 +181,8 @@ namespace AMDiS {
Mesh
::
CALL_EVERY_EL_PREORDER
);
while
(
elInfo
)
{
if
(
elInfo
->
getElement
()
->
getIndex
()
==
parEl
->
getIndex
())
std
::
cout
<<
"EL INFO TO "
<<
parEl
->
getIndex
()
<<
": "
<<
elInfo
->
getType
()
<<
std
::
endl
;
std
::
cout
<<
"
[DBG]
EL INFO TO "
<<
parEl
->
getIndex
()
<<
": "
<<
" tzpe = "
<<
elInfo
->
getType
()
<<
std
::
endl
;
elInfo
=
stack
.
traverseNext
(
elInfo
);
}
...
...
AMDiS/src/Debug.h
View file @
db890e76
...
...
@@ -73,6 +73,9 @@ namespace AMDiS {
*/
void
writeElementIndexMesh
(
FiniteElemSpace
*
feSpace
,
std
::
string
filename
);
void
highlightElementIndexMesh
(
FiniteElemSpace
*
feSpace
,
int
idx
,
std
::
string
filename
);
void
colorDofVectorByLocalElementDofs
(
DOFVector
<
double
>&
vec
,
Element
*
el
);
bool
colorDofVectorByLocalElementDofs
(
DOFVector
<
double
>&
vec
,
...
...
AMDiS/src/Element.h
View file @
db890e76
...
...
@@ -346,11 +346,21 @@ namespace AMDiS {
/** \brief
* Returns which side of child[childnr] corresponds to side sidenr of this
* Element. If the child has no corresponding side, the return value is negative.
* isBisected is true after the function call, if the side of the child is only
* a part of element's side, false otherwise.
*/
virtual
int
getSideOfChild
(
int
childnr
,
int
sidenr
,
int
elType
=
0
)
const
=
0
;
/** \brief
* Generalization of \ref getSideOfChild to arbitrary subObject. Thus, e.g., in 3d
* we can ask for the local id of a verte, edge or face on the elements children.
*
* \param[in] childnr Either 0 or 1 for the left or right children.
* \param[in] subObj Defines whether we ask for VERTEX, EDGE or FACE.
* \param[in] ithObj Number of the object on the parent.
* \param[in] elType Type of the element. Important only in 3D.
*/
virtual
int
getSubObjOfChild
(
int
childnr
,
GeoIndex
subObj
,
int
ithObj
,
int
elType
=
0
)
const
=
0
;
/** \brief
* Returns which vertex of elements parent corresponds to the vertexnr of
* the element, if the element is the childnr-th child of the parent.
...
...
AMDiS/src/Line.h
View file @
db890e76
...
...
@@ -84,7 +84,7 @@ namespace AMDiS {
inline
int
getEdgeOfFace
(
int
/* face */
,
int
/*edge*/
)
const
{
ERROR_EXIT
(
"
called for a line
\n
"
);
ERROR_EXIT
(
"
This does not work in 2D!
\n
"
);
return
0
;
}
...
...
@@ -100,7 +100,7 @@ namespace AMDiS {
}
/// implements Element::getSideOfChild()
virtual
int
getSideOfChild
(
int
child
,
int
side
,
int
)
const
int
getSideOfChild
(
int
child
,
int
side
,
int
)
const
{
FUNCNAME
(
"Line::getSideOfChild()"
);
TEST_EXIT_DBG
(
child
==
0
||
child
==
1
)(
"Child must be either 0 or 1!
\n
"
);
...
...
@@ -108,8 +108,14 @@ namespace AMDiS {
return
sideOfChild
[
child
][
side
];
}
int
getSubObjOfChild
(
int
childnr
,
GeoIndex
subObj
,
int
ithObj
,
int
elType
)
const
{
ERROR_EXIT
(
"Not yet implemented!
\n
"
);
return
0
;
}
/// implements Element::getVertexOfParent()
virtual
int
getVertexOfParent
(
int
child
,
int
side
,
int
)
const
int
getVertexOfParent
(
int
child
,
int
side
,
int
)
const
{
FUNCNAME
(
"Line::getVertexOfParent()"
);
TEST_EXIT_DBG
(
child
==
0
||
child
==
1
)(
"Child must be either 0 or 1!
\n
"
);
...
...
AMDiS/src/MeshStructure.cc
View file @
db890e76
...
...
@@ -11,6 +11,7 @@ namespace AMDiS {
const
int
MeshStructure
::
unsignedLongSize
=
sizeof
(
unsigned
long
int
)
*
8
;
void
MeshStructure
::
insertElement
(
bool
isLeaf
)
{
// overflow? -> next index
...
...
@@ -30,6 +31,7 @@ namespace AMDiS {
nElements
++
;
}
void
MeshStructure
::
clear
()
{
currentCode
=
0
;
...
...
@@ -39,6 +41,7 @@ namespace AMDiS {
currentElement
=
0
;
}
void
MeshStructure
::
init
(
Mesh
*
mesh
)
{
clear
();
...
...
@@ -53,28 +56,6 @@ namespace AMDiS {
commit
();
}
void
MeshStructure
::
init
(
Element
*
el
,
int
ithSide
,
int
elType
,
bool
reverseOrder
)
{
FUNCNAME
(
"MeshStructure::init()"
);
clear
();
int
s1
=
el
->
getSideOfChild
(
0
,
ithSide
,
elType
);
int
s2
=
el
->
getSideOfChild
(
1
,
ithSide
,
elType
);
TEST_EXIT
(
s1
!=
-
1
||
s2
!=
-
1
)(
"This should not happen!
\n
"
);
if
(
!
el
->
isLeaf
())
{
if
(
s1
==
-
1
)
addAlongSide
(
el
->
getSecondChild
(),
s2
,
el
->
getChildType
(
elType
),
reverseOrder
);
else
if
(
s2
==
-
1
)
addAlongSide
(
el
->
getFirstChild
(),
s1
,
el
->
getChildType
(
elType
),
reverseOrder
);
else
addAlongSide
(
el
,
ithSide
,
elType
,
reverseOrder
);
}
commit
();
}
void
MeshStructure
::
init
(
BoundaryObject
&
bound
)
{
...
...
@@ -84,56 +65,58 @@ namespace AMDiS {
clear
();
int
s1
=
el
->
getS
ide
OfChild
(
0
,
bound
.
ithObj
,
bound
.
elType
);
int
s2
=
el
->
getS
ide
OfChild
(
1
,
bound
.
ithObj
,
bound
.
elType
);
int
s1
=
el
->
getS
ubObj
OfChild
(
0
,
bound
.
subObj
,
bound
.
ithObj
,
bound
.
elType
);
int
s2
=
el
->
getS
ubObj
OfChild
(
1
,
bound
.
subObj
,
bound
.
ithObj
,
bound
.
elType
);
TEST_EXIT
(
s1
!=
-
1
||
s2
!=
-
1
)(
"This should not happen!
\n
"
);
if
(
!
el
->
isLeaf
())
{
if
(
s1
==
-
1
)
addAlongSide
(
el
->
getSecondChild
(),
s2
,
addAlongSide
(
el
->
getSecondChild
(),
bound
.
subObj
,
s2
,
el
->
getChildType
(
bound
.
elType
),
bound
.
reverseMode
);
else
if
(
s2
==
-
1
)
addAlongSide
(
el
->
getFirstChild
(),
s1
,
addAlongSide
(
el
->
getFirstChild
(),
bound
.
subObj
,
s1
,
el
->
getChildType
(
bound
.
elType
),
bound
.
reverseMode
);
else
addAlongSide
(
el
,
bound
.
ithObj
,
bound
.
elType
,
bound
.
reverseMode
);
addAlongSide
(
el
,
bound
.
subObj
,
bound
.
ithObj
,
bound
.
elType
,
bound
.
reverseMode
);
}
commit
();
}
void
MeshStructure
::
addAlongSide
(
Element
*
el
,
int
ithSide
,
int
elType
,
bool
reverseOrder
)
void
MeshStructure
::
addAlongSide
(
Element
*
el
,
GeoIndex
subObj
,
int
ithObj
,
int
elType
,
bool
reverseOrder
)
{
FUNCNAME
(
"MeshStructure::addAlongSide()"
);
if
(
debugMode
)
{
MSG
(
"addAlondSide(%d, %d, %d, %d)
\n
"
,
el
->
getIndex
(),
ith
Side
,
elType
,
reverseOrder
);
el
->
getIndex
(),
ith
Obj
,
elType
,
reverseOrder
);
MSG
(
"Element is leaf: %d
\n
"
,
el
->
isLeaf
());
}
insertElement
(
el
->
isLeaf
());
if
(
!
el
->
isLeaf
())
{
int
s1
=
el
->
getS
ide
OfChild
(
0
,
ithSide
,
elType
);
int
s2
=
el
->
getS
ide
OfChild
(
1
,
ithSide
,
elType
);