Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Backofen, Rainer
amdis
Commits
2d7b92be
Commit
2d7b92be
authored
Feb 24, 2011
by
Thomas Witkowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A lot of optimizations in the assembling procedure, try to use more MTL4.
parent
9c0ddcb3
Changes
44
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
44 changed files
with
1515 additions
and
1504 deletions
+1515
-1504
AMDiS/Makefile.in
AMDiS/Makefile.in
+2
-1
AMDiS/aclocal.m4
AMDiS/aclocal.m4
+29
-7
AMDiS/bin/Makefile.am
AMDiS/bin/Makefile.am
+1
-1
AMDiS/bin/Makefile.in
AMDiS/bin/Makefile.in
+2
-1
AMDiS/compositeFEM/src/CompositeFEMOperator.cc
AMDiS/compositeFEM/src/CompositeFEMOperator.cc
+6
-11
AMDiS/configure
AMDiS/configure
+158
-56
AMDiS/libtool
AMDiS/libtool
+50
-41
AMDiS/src/Assembler.cc
AMDiS/src/Assembler.cc
+1
-1
AMDiS/src/BasisFunction.cc
AMDiS/src/BasisFunction.cc
+6
-24
AMDiS/src/BasisFunction.h
AMDiS/src/BasisFunction.h
+2
-13
AMDiS/src/BoundaryManager.cc
AMDiS/src/BoundaryManager.cc
+3
-15
AMDiS/src/BoundaryManager.h
AMDiS/src/BoundaryManager.h
+4
-4
AMDiS/src/DOFMatrix.cc
AMDiS/src/DOFMatrix.cc
+2
-2
AMDiS/src/DOFVector.cc
AMDiS/src/DOFVector.cc
+13
-16
AMDiS/src/DOFVector.h
AMDiS/src/DOFVector.h
+0
-6
AMDiS/src/DOFVector.hh
AMDiS/src/DOFVector.hh
+26
-33
AMDiS/src/DirichletBC.cc
AMDiS/src/DirichletBC.cc
+3
-6
AMDiS/src/DirichletBC.h
AMDiS/src/DirichletBC.h
+3
-2
AMDiS/src/FirstOrderAssembler.cc
AMDiS/src/FirstOrderAssembler.cc
+96
-106
AMDiS/src/FirstOrderAssembler.h
AMDiS/src/FirstOrderAssembler.h
+3
-6
AMDiS/src/FirstOrderTerm.cc
AMDiS/src/FirstOrderTerm.cc
+79
-51
AMDiS/src/FirstOrderTerm.h
AMDiS/src/FirstOrderTerm.h
+62
-58
AMDiS/src/Lagrange.h
AMDiS/src/Lagrange.h
+41
-34
AMDiS/src/MatrixVector.h
AMDiS/src/MatrixVector.h
+0
-43
AMDiS/src/Operator.cc
AMDiS/src/Operator.cc
+42
-73
AMDiS/src/Operator.h
AMDiS/src/Operator.h
+44
-77
AMDiS/src/Operator.hh
AMDiS/src/Operator.hh
+4
-23
AMDiS/src/ProblemVec.cc
AMDiS/src/ProblemVec.cc
+211
-2
AMDiS/src/ProblemVec.h
AMDiS/src/ProblemVec.h
+13
-0
AMDiS/src/QPsiPhi.h
AMDiS/src/QPsiPhi.h
+250
-434
AMDiS/src/Quadrature.cc
AMDiS/src/Quadrature.cc
+22
-32
AMDiS/src/Quadrature.h
AMDiS/src/Quadrature.h
+23
-21
AMDiS/src/ResidualEstimator.cc
AMDiS/src/ResidualEstimator.cc
+8
-8
AMDiS/src/RobinBC.cc
AMDiS/src/RobinBC.cc
+6
-7
AMDiS/src/SecondOrderAssembler.cc
AMDiS/src/SecondOrderAssembler.cc
+113
-118
AMDiS/src/SecondOrderAssembler.h
AMDiS/src/SecondOrderAssembler.h
+9
-19
AMDiS/src/SecondOrderTerm.cc
AMDiS/src/SecondOrderTerm.cc
+90
-63
AMDiS/src/SecondOrderTerm.h
AMDiS/src/SecondOrderTerm.h
+46
-34
AMDiS/src/SubAssembler.cc
AMDiS/src/SubAssembler.cc
+4
-8
AMDiS/src/SubAssembler.h
AMDiS/src/SubAssembler.h
+2
-3
AMDiS/src/SurfaceOperator.h
AMDiS/src/SurfaceOperator.h
+6
-8
AMDiS/src/ZeroOrderAssembler.cc
AMDiS/src/ZeroOrderAssembler.cc
+28
-35
AMDiS/src/ZeroOrderAssembler.h
AMDiS/src/ZeroOrderAssembler.h
+1
-1
AMDiS/src/io/FileWriter.cc
AMDiS/src/io/FileWriter.cc
+1
-0
No files found.
AMDiS/Makefile.in
View file @
2d7b92be
...
...
@@ -142,6 +142,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR
=
@PATH_SEPARATOR@
PETSC_DIR
=
@PETSC_DIR@
RANLIB
=
@RANLIB@
SED
=
@SED@
SET_MAKE
=
@SET_MAKE@
SHELL
=
@SHELL@
STRIP
=
@STRIP@
...
...
@@ -418,7 +419,7 @@ distdir: $(DISTFILES)
||
exit
1
;
\
fi
;
\
done
-
find
$(distdir)
-type
d
!
-perm
-7
77
-exec
chmod
a+rwx
{}
\;
-o
\
-
find
$(distdir)
-type
d
!
-perm
-7
55
-exec
chmod
a+rwx
,go+rx
{}
\;
-o
\
!
-type
d
!
-perm
-444
-links
1
-exec
chmod
a+r
{}
\;
-o
\
!
-type
d
!
-perm
-400
-exec
chmod
a+r
{}
\;
-o
\
!
-type
d
!
-perm
-444
-exec
$(SHELL)
$(install_sh)
-c
-m
a+r
{}
{}
\;
\
...
...
AMDiS/aclocal.m4
View file @
2d7b92be
...
...
@@ -1578,10 +1578,27 @@ 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)); 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"
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"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
...
...
@@ -4288,6 +4305,9 @@ 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
...
...
@@ -4421,11 +4441,11 @@ striplib=$lt_striplib
# Dependencies to place before the objects being linked to create a
# shared library.
predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
predep_objects=
\`echo
$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
| \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place after the objects being linked to create a
# shared library.
postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
postdep_objects=
\`echo
$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
| \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`
# Dependencies to place before the objects being linked to create a
# shared library.
...
...
@@ -4437,7 +4457,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=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
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"\`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method=$lt_deplibs_check_method
...
...
@@ -4517,7 +4537,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=$lt_sys_lib_search_path_spec
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"\`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
...
...
@@ -6319,7 +6339,7 @@ ifelse([AC_DISABLE_FAST_INSTALL])
AC_DEFUN([LT_AC_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj, no)
test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O
2
"
test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O
3
"
AC_SUBST(GCJFLAGS)
])
...
...
@@ -6353,6 +6373,7 @@ 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
...
...
@@ -6385,6 +6406,7 @@ 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.am
View file @
2d7b92be
...
...
@@ -59,7 +59,7 @@ INCLUDES = $(AMDIS_INCLUDES) $(PARALLEL_INCLUDES) $(TEMPLATE_INCLUDES)
if
AMDIS_DEBUG
libamdis_la_CXXFLAGS
+=
-g
-O0
-Wall
-DDEBUG
=
1
$(OPENMP_FLAG)
$(INCLUDES)
#-pedantic
else
libamdis_la_CXXFLAGS
+=
-O
2
-Wall
-DDEBUG
=
0
-DNDEBUG
$(OPENMP_FLAG)
-ftemplate-depth-100
$(INCLUDES)
#-pedantic
libamdis_la_CXXFLAGS
+=
-O
3
-Wall
-DDEBUG
=
0
-DNDEBUG
$(OPENMP_FLAG)
-ftemplate-depth-100
$(INCLUDES)
#-pedantic
endif
...
...
AMDiS/bin/Makefile.in
View file @
2d7b92be
...
...
@@ -64,7 +64,7 @@ host_triplet = @host@
@ENABLE_DUNE_TRUE@
am__append_8
=
-I
$(DUNE_DIR)
@ENABLE_BOOST_TRUE@
am__append_9
=
-DHAVE_BOOST
=
1
@AMDIS_DEBUG_TRUE@
am__append_10
=
-g
-O0
-Wall
-DDEBUG
=
1
$(OPENMP_FLAG)
$(INCLUDES)
#-pedantic
@AMDIS_DEBUG_FALSE@
am__append_11
=
-O
2
-Wall
-DDEBUG
=
0
-DNDEBUG
$(OPENMP_FLAG)
-ftemplate-depth-100
$(INCLUDES)
#-pedantic
@AMDIS_DEBUG_FALSE@
am__append_11
=
-O
3
-Wall
-DDEBUG
=
0
-DNDEBUG
$(OPENMP_FLAG)
-ftemplate-depth-100
$(INCLUDES)
#-pedantic
subdir
=
bin
DIST_COMMON
=
$(srcdir)
/Makefile.am
$(srcdir)
/Makefile.in
ACLOCAL_M4
=
$(top_srcdir)
/aclocal.m4
...
...
@@ -438,6 +438,7 @@ 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/compositeFEM/src/CompositeFEMOperator.cc
View file @
2d7b92be
...
...
@@ -123,10 +123,8 @@ CompositeFEMOperator::getElementMatrix(const ElInfo *elInfo,
subElementAssembler
->
getNCol
());
set_to_zero
(
subPolMat2
);
int
myRank
=
omp_get_thread_num
();
if
(
!
assembler
[
myRank
])
{
assembler
[
myRank
]
=
if
(
!
assembler
)
{
assembler
=
new
StandardAssembler
(
this
,
NULL
,
NULL
,
NULL
,
NULL
,
rowFeSpace
,
colFeSpace
);
}
...
...
@@ -138,7 +136,7 @@ CompositeFEMOperator::getElementMatrix(const ElInfo *elInfo,
elLS
->
setLevelSetDomain
(
ElementLevelSet
::
LEVEL_SET_INTERIOR
);
}
assembler
[
myRank
]
->
calculateElementMatrix
(
elInfo
,
elMat
,
1.0
);
assembler
->
calculateElementMatrix
(
elInfo
,
elMat
,
1.0
);
subElementAssembler
->
getSubPolytopeMatrix
(
subPolytope
,
subElementAssembler
,
elInfo
,
...
...
@@ -258,12 +256,9 @@ CompositeFEMOperator::getElementVector(const ElInfo *elInfo,
ElementVector
subPolVec2
(
subElementAssembler
->
getNRow
());
set_to_zero
(
subPolVec2
);
int
myRank
=
omp_get_thread_num
();
if
(
!
assembler
[
myRank
])
{
assembler
[
myRank
]
=
if
(
!
assembler
)
assembler
=
new
StandardAssembler
(
this
,
NULL
,
NULL
,
NULL
,
NULL
,
rowFeSpace
,
colFeSpace
);
}
if
(
elLS
->
getLevelSetDomain
()
==
ElementLevelSet
::
LEVEL_SET_INTERIOR
)
{
...
...
@@ -272,7 +267,7 @@ CompositeFEMOperator::getElementVector(const ElInfo *elInfo,
elLS
->
setLevelSetDomain
(
ElementLevelSet
::
LEVEL_SET_INTERIOR
);
}
assembler
[
myRank
]
->
calculateElementVector
(
elInfo
,
elVec
,
1.0
);
assembler
->
calculateElementVector
(
elInfo
,
elVec
,
1.0
);
subElementAssembler
->
getSubPolytopeVector
(
subPolytope
,
subElementAssembler
,
elInfo
,
...
...
AMDiS/configure
View file @
2d7b92be
This diff is collapsed.
Click to expand it.
AMDiS/libtool
View file @
2d7b92be
...
...
@@ -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
=
"/
usr/
bin/sed"
SED
=
"/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed
=
"/
usr/
bin/sed -e 1s/^X//"
Xsed
=
"/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
deimos103
:
# Libtool was configured on host
NWRW15
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -66,12 +66,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
x86_64-unknown
-linux-gnu
host
=
i686-pc
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
x86_64-unknown
-linux-gnu
build
=
i686-pc
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -82,22 +82,25 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
LTCC
=
"
g
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O
2
"
LTCFLAGS
=
"-g -O
3
"
# A language-specific compiler.
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
CC
=
"
g
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/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
LD
=
"/usr/
bin/ld
"
# Whether we need hard or soft links.
LN_S
=
"ln -s"
...
...
@@ -171,7 +174,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
link_static_flag
=
""
link_static_flag
=
"
-static
"
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
...
...
@@ -229,11 +232,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
predep_objects
=
""
predep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Dependencies to place after the objects being linked to create a
# shared library.
postdep_objects
=
""
postdep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Dependencies to place before the objects being linked to create a
# shared library.
...
...
@@ -245,7 +248,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path
=
""
compiler_lib_search_path
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
...
...
@@ -325,10 +328,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
=
" /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/../../../
../lib64/ /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/"
sys_lib_search_path_spec
=
`
echo
" /u/witkowski/local/lib/i386-redhat-linux/4.1.2/ /u/witkowski/local/lib/ /u/witkowski/local/intel/mkl/10.0.1.014/lib/32/i386-redhat-linux/4.1.2/ /u/witkowski/local/intel/mkl/10.0.1.014/lib/32
/ /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"
`
# Run-time system search path for libraries
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/Pathscale3.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
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/mysql /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib /usr/lib/qt4/lib /usr/lib/xulrunner-1.9.2
"
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -6760,7 +6763,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
deimos103
:
# Libtool was configured on host
NWRW15
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -6782,12 +6785,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
x86_64-unknown
-linux-gnu
host
=
i686-pc
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
x86_64-unknown
-linux-gnu
build
=
i686-pc
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -6798,22 +6801,25 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
LTCC
=
"
g
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O
2
"
LTCFLAGS
=
"-g -O
3
"
# A language-specific compiler.
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicxx
"
CC
=
"
g++
"
# 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/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
LD
=
"/usr/
bin/ld
"
# Whether we need hard or soft links.
LN_S
=
"ln -s"
...
...
@@ -6887,7 +6893,7 @@ dlopen_self=unknown
dlopen_self_static
=
unknown
# Compiler flag to prevent dynamic linking.
link_static_flag
=
""
link_static_flag
=
"
-static
"
# Compiler flag to turn off builtin functions.
no_builtin_flag
=
" -fno-builtin"
...
...
@@ -6942,11 +6948,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
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"
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"
`
# Dependencies to place after the objects being linked to create a
# shared library.
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"
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"
`
# Dependencies to place before the objects being linked to create a
# shared library.
...
...
@@ -6954,11 +6960,11 @@ predeps=""
# Dependencies to place after the objects being linked to create a
# shared library.
postdeps
=
"
-lmpi_cxx -lmpi -lopen-rte -lopen-pal -libverbs -lrt -lnuma -ldl -lnsl -lutil -ldl
-lstdc++ -lm -lgcc_s
-lpthread
-lc -lgcc_s"
postdeps
=
"-lstdc++ -lm -lgcc_s -lc -lgcc_s"
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path
=
"-L/usr
/lib
64
-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/../../.."
compiler_lib_search_path
=
`
echo
"-L/u/witkowski/local
/lib -L/
u/witkowski/local/intel/mkl/10.0.1.014
/lib
/32
-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"
`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
...
...
@@ -7038,10 +7044,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
=
" /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/../../../
../lib64/ /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/"
sys_lib_search_path_spec
=
`
echo
" /u/witkowski/local/lib/i386-redhat-linux/4.1.2/ /u/witkowski/local/lib/ /u/witkowski/local/intel/mkl/10.0.1.014/lib/32/i386-redhat-linux/4.1.2/ /u/witkowski/local/intel/mkl/10.0.1.014/lib/32
/ /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"
`
# Run-time system search path for libraries
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/Pathscale3.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
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/mysql /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib /usr/lib/qt4/lib /usr/lib/xulrunner-1.9.2
"
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -7065,7 +7071,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host
deimos103
:
# Libtool was configured on host
NWRW15
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -7087,12 +7093,12 @@ fast_install=yes
# The host system.
host_alias
=
host
=
x86_64-unknown
-linux-gnu
host
=
i686-pc
-linux-gnu
host_os
=
linux-gnu
# The build system.
build_alias
=
build
=
x86_64-unknown
-linux-gnu
build
=
i686-pc
-linux-gnu
build_os
=
linux-gnu
# An echo program that does not interpret backslashes.
...
...
@@ -7103,22 +7109,25 @@ AR="ar"
AR_FLAGS
=
"cru"
# A C compiler.
LTCC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpi
cc"
LTCC
=
"
g
cc"
# LTCC compiler flags.
LTCFLAGS
=
"-g -O
2
"
LTCFLAGS
=
"-g -O
3
"
# A language-specific compiler.
CC
=
"g77"
# Is the compiler the GNU C compiler?
with_gcc
=
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/
x86_64-suse-linux/bin/ld -m elf_x86_64
"
LD
=
"/usr/
bin/ld
"
# Whether we need hard or soft links.
LN_S
=
"ln -s"
...
...
@@ -7250,11 +7259,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
predep_objects
=
""
predep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Dependencies to place after the objects being linked to create a
# shared library.
postdep_objects
=
""
postdep_objects
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Dependencies to place before the objects being linked to create a
# shared library.
...
...
@@ -7266,7 +7275,7 @@ postdeps=""
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path
=
""
compiler_lib_search_path
=
`
echo
""
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
...
...
@@ -7346,10 +7355,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
=
" /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/"
sys_lib_search_path_spec
=
`
echo
" /u/witkowski/local/lib/i386-redhat-linux/3.4.6/ /u/witkowski/local/lib/ /u/witkowski/local/intel/mkl/10.0.1.014/lib/32/i386-redhat-linux/3.4.6/ /u/witkowski/local/intel/mkl/10.0.1.014/lib/32
/ /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"
`
# Run-time system search path for libraries
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/Pathscale3.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
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/mysql /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib /usr/lib/qt4/lib /usr/lib/xulrunner-1.9.2
"
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
AMDiS/src/Assembler.cc
View file @
2d7b92be
...
...
@@ -379,7 +379,7 @@ namespace AMDiS {
if
(
secondOrderAssembler
)
secondOrderAssembler
->
initElement
(
smallElInfo
,
largeElInfo
,
quad
);
if
(
firstOrderAssemblerGrdPsi
)
firstOrderAssemblerGrdPsi
->
initElement
(
smallElInfo
,
largeElInfo
,
quad
);
firstOrderAssemblerGrdPsi
->
initElement
(
smallElInfo
,
largeElInfo
,
quad
);
if
(
firstOrderAssemblerGrdPhi
)
firstOrderAssemblerGrdPhi
->
initElement
(
smallElInfo
,
largeElInfo
,
quad
);
if
(
zeroOrderAssembler
)
...
...
AMDiS/src/BasisFunction.cc
View file @
2d7b92be
...
...
@@ -36,24 +36,11 @@ namespace AMDiS {
nDOF
=
new
DimVec
<
int
>
(
dim
,
DEFAULT_VALUE
,
-
1
);
dow
=
Global
::
getGeo
(
WORLD
);
grdTmpVec1
.
resize
(
omp_get_overall_max_threads
());
grdTmpVec2
.
resize
(
omp_get_overall_max_threads
());
for
(
int
i
=
0
;
i
<
omp_get_overall_max_threads
();
i
++
)
{
grdTmpVec1
[
i
]
=
new
DimVec
<
double
>
(
dim
,
DEFAULT_VALUE
,
0.0
);
grdTmpVec2
[
i
]
=
new
DimVec
<
double
>
(
dim
,
DEFAULT_VALUE
,
0.0
);
}
}
BasisFunction
::~
BasisFunction
()
{
delete
nDOF
;
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
grdTmpVec1
.
size
());
i
++
)
{
delete
grdTmpVec1
[
i
];
delete
grdTmpVec2
[
i
];
}
}
/****************************************************************************/
...
...
@@ -99,27 +86,22 @@ namespace AMDiS {
const
ElementVector
&
uh_loc
,
WorldVector
<
double
>*
val
)
const
{
TEST_EXIT_DBG
(
val
)(
"return value is NULL
\n
"
);
int
myRank
=
omp_get_thread_num
();
DimVec
<
double
>
*
grdTmp1
=
grdTmpVec1
[
myRank
];
DimVec
<
double
>
*
grdTmp2
=
grdTmpVec2
[
myRank
];
TEST_EXIT_DBG
(
val
)(
"Return value is NULL
\n
"
);
for
(
int
j
=
0
;
j
<
dim
+
1
;
j
++
)
(
*
grdTmp2
)[
j
]
=
0.0
;
mtl
::
dense_vector
<
double
>
grdTmp1
(
dim
+
1
)
;
mtl
::
dense_vector
<
double
>
grdTmp2
(
dim
+
1
,
0.0
)
;
for
(
int
i
=
0
;
i
<
nBasFcts
;
i
++
)
{
(
*
(
*
grdPhi
)[
i
])(
lambda
,
*
grdTmp1
);
(
*
(
*
grdPhi
)[
i
])(
lambda
,
grdTmp1
);
for
(
int
j
=
0
;
j
<
dim
+
1
;
j
++
)
(
*
grdTmp2
)
[
j
]
+=
uh_loc
[
i
]
*
(
*
grdTmp1
)
[
j
];
grdTmp2
[
j
]
+=
uh_loc
[
i
]
*
grdTmp1
[
j
];
}
for
(
int
i
=
0
;
i
<
dow
;
i
++
)
{
(
*
val
)[
i
]
=
0.0
;
for
(
int
j
=
0
;
j
<
dim
+
1
;
j
++
)
(
*
val
)[
i
]
+=
grd_lambda
[
j
][
i
]
*
(
*
grdTmp2
)
[
j
];
(
*
val
)[
i
]
+=
grd_lambda
[
j
][
i
]
*
grdTmp2
[
j
];
}
return
((
*
val
));
...
...
AMDiS/src/BasisFunction.h
View file @
2d7b92be
...
...
@@ -51,7 +51,8 @@ namespace AMDiS {
virtual
~
GrdBasFctType
()
{}
virtual
void
operator
()(
const
DimVec
<
double
>&
,
DimVec
<
double
>&
)
const
=
0
;
virtual
void
operator
()(
const
DimVec
<
double
>&
,
mtl
::
dense_vector
<
double
>&
)
const
=
0
;
};
...
...
@@ -371,18 +372,6 @@ namespace AMDiS {
/// Vector of second derivatives
std
::
vector
<
D2BasFctType
*>
*
d2Phi
;
/** \brief
* Is used by function evalGrdUh. To make it thread safe, we need a
* temporary DimVec for every thread.
*/
std
::
vector
<
DimVec
<
double
>*
>
grdTmpVec1
;
/** \brief
* Is used by function evalGrdUh. To make it thread safe, we need a
* temporary DimVec for every thread.
*/
std
::
vector
<
DimVec
<
double
>*
>
grdTmpVec2
;
};
}
...
...
AMDiS/src/BoundaryManager.cc
View file @
2d7b92be
...
...
@@ -17,7 +17,6 @@
#include "Traverse.h"
#include "BasisFunction.h"
#include "ElInfo.h"
#include "OpenMP.h"
namespace
AMDiS
{
...
...
@@ -27,11 +26,8 @@ namespace AMDiS {
BoundaryManager
::
BoundaryManager
(
const
FiniteElemSpace
*
feSpace
)
{
localBounds
.
resize
(
omp_get_overall_max_threads
());
dofIndices
.
resize
(
omp_get_overall_max_threads
());
allocatedMemoryLocalBounds
=
feSpace
->
getBasisFcts
()
->
getNumber
();
for
(
unsigned
int
i
=
0
;
i
<
localBounds
.
size
();
i
++
)
localBounds
[
i
]
=
new
BoundaryType
[
allocatedMemoryLocalBounds
];
localBound
=
new
BoundaryType
[
allocatedMemoryLocalBounds
];
}
...
...
@@ -39,17 +35,13 @@ namespace AMDiS {
{
localBCs
=
bm
.
localBCs
;
allocatedMemoryLocalBounds
=
bm
.
allocatedMemoryLocalBounds
;
localBounds
.
resize
(
bm
.
localBounds
.
size
());
dofIndices
.
resize
(
bm
.
localBounds
.
size
());
for
(
unsigned
int
i
=
0
;
i
<
localBounds
.
size
();
i
++
)
localBounds
[
i
]
=
new
BoundaryType
[
allocatedMemoryLocalBounds
];
localBound
=
new
BoundaryType
[
allocatedMemoryLocalBounds
];
}
BoundaryManager
::~
BoundaryManager
()