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
99ad7c08
Commit
99ad7c08
authored
Jan 04, 2010
by
Thomas Witkowski
Browse files
Merged two AMDiS directories, no changes.
parent
eb4bddc0
Changes
7
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
99ad7c08
...
...
@@ -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
deimos103
:
# 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
" /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
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
deimos103
:
# 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/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.
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
" /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
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
deimos103
:
# 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
" /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
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/DOFAdmin.cc
View file @
99ad7c08
...
...
@@ -124,7 +124,7 @@ namespace AMDiS {
int
dof
=
0
;
// if there is a hole
if
(
firstHole
<
static_cast
<
int
>
(
dofFree
.
size
()))
{
if
(
firstHole
<
static_cast
<
int
>
(
dofFree
.
size
()))
{
TEST_EXIT_DBG
(
dofFree
[
firstHole
])(
"no hole at firstHole!
\n
"
);
// its no longer a hole
dofFree
[
firstHole
]
=
false
;
...
...
@@ -140,6 +140,7 @@ namespace AMDiS {
}
else
{
// if there is no hole
// enlarge dof-list
enlargeDOFLists
(
0
);
TEST_EXIT_DBG
(
firstHole
<
static_cast
<
int
>
(
dofFree
.
size
()))
(
"no free entry after enlargeDOFLists
\n
"
);
TEST_EXIT_DBG
(
dofFree
[
firstHole
])(
"no free bit at firstHole
\n
"
);
...
...
@@ -153,7 +154,7 @@ namespace AMDiS {
holeCount
--
;
sizeUsed
=
max
(
sizeUsed
,
dof
+
1
);
return
(
dof
)
;
return
dof
;
}
void
DOFAdmin
::
enlargeDOFLists
(
int
minsize
)
...
...
@@ -179,8 +180,10 @@ namespace AMDiS {
std
::
list
<
DOFIndexedBase
*>::
iterator
di
;
for
(
di
=
dofIndexedList
.
begin
();
di
!=
dofIndexedList
.
end
();
++
di
)
if
((
*
di
)
->
getSize
()
<
newval
)
(
*
di
)
->
resize
(
newval
);
if
((
*
di
)
->
getSize
()
<
newval
)
{
(
*
di
)
->
resize
(
newval
);
std
::
cout
<<
"RESIE WITH "
<<
(
*
di
)
->
getSize
()
<<
" "
<<
newval
<<
std
::
endl
;
}
}
void
DOFAdmin
::
addDOFIndexed
(
DOFIndexedBase
*
dofIndexed
)
...
...
AMDiS/src/DOFVector.h
View file @
99ad7c08
...
...
@@ -419,7 +419,7 @@ namespace AMDiS {
inline
void
resize
(
int
n
)
{
FUNCNAME
(
"DOFVector<T>::resize()"
);
TEST_EXIT_DBG
(
(
n
>=
0
)
)
(
"Can't resize DOFVector to negative size
\n
"
);
TEST_EXIT_DBG
(
n
>=
0
)(
"Can't resize DOFVector to negative size
\n
"
);
vec
.
resize
(
n
);
}
...
...
@@ -427,7 +427,7 @@ namespace AMDiS {
inline
void
resize
(
int
n
,
T
init
)
{
FUNCNAME
(
"DOFVector<T>::resize()"
);
TEST_EXIT_DBG
(
(
n
>=
0
)
)
(
"Can't resize DOFVector to negative size
\n
"
);
TEST_EXIT_DBG
(
n
>=
0
)(
"Can't resize DOFVector to negative size
\n
"
);
vec
.
resize
(
n
,
init
);
}
...
...
@@ -435,7 +435,7 @@ namespace AMDiS {
inline
const
T
&
operator
[](
DegreeOfFreedom
i
)
const
{
FUNCNAME
(
"DOFVector<T>::operator[]"
);
TEST_EXIT_DBG
(
(
i
>=
0
)
&&
(
i
<
static_cast
<
int
>
(
vec
.
size
()))
)
TEST_EXIT_DBG
(
i
>=
0
&&
i
<
static_cast
<
int
>
(
vec
.
size
()))
(
"Illegal vector index %d.
\n
"
,
i
);
return
vec
[
i
];
}
...
...
@@ -444,7 +444,7 @@ namespace AMDiS {
inline
T
&
operator
[](
DegreeOfFreedom
i
)
{
FUNCNAME
(
"DOFVector<T>::operator[]"
);
TEST_EXIT_DBG
(
(
i
>=
0
)
&&
(
i
<
static_cast
<
int
>
(
vec
.
size
()))
)
TEST_EXIT_DBG
(
i
>=
0
&&
i
<
static_cast
<
int
>
(
vec
.
size
()))
(
"Illegal vector index %d.
\n
"
,
i
);
return
vec
[
i
];
}
...
...
AMDiS/src/DOFVector.hh
View file @
99ad7c08
...
...
@@ -71,9 +71,10 @@ namespace AMDiS {
DOFVectorBase
<
T
>::
DOFVectorBase
(
const
FiniteElemSpace
*
f
,
std
::
string
n
)
:
feSpace
(
f
),
name
(
n
),
elementVector
(
f
->
getBasisFcts
()
->
getNumber
()),
//
elementVector(f->getBasisFcts()->getNumber()),
boundaryManager
(
NULL
)
{
/*
nBasFcts = feSpace->getBasisFcts()->getNumber();
dim = feSpace->getMesh()->getDim();
...
...
@@ -90,6 +91,7 @@ namespace AMDiS {
grdTmp[i] = new DimVec<double>(dim, DEFAULT_VALUE, 0.0);
D2Phis[i] = new DimMat<double>(dim, NO_INIT);
}
*/
}
template
<
typename
T
>
...
...
@@ -116,11 +118,11 @@ namespace AMDiS {
template
<
typename
T
>
void
DOFVector
<
T
>::
init
(
const
FiniteElemSpace
*
f
,
std
::
string
n
)
{
this
->
name
=
n
;
this
->
feSpace
=
f
;
if
(
this
->
feSpace
&&
this
->
feSpace
->
getAdmin
())
(
this
->
feSpace
->
getAdmin
())
->
addDOFIndexed
(
this
);
this
->
boundaryManager
=
new
BoundaryManager
(
f
);
//
this->name = n;
//
this->feSpace = f;
//
if (this->feSpace && this->feSpace->getAdmin())
//
(this->feSpace->getAdmin())->addDOFIndexed(this);
//
this->boundaryManager = new BoundaryManager(f);
}
template
<
typename
T
>
...
...
AMDiS/src/MacroReader.cc
View file @
99ad7c08
...
...
@@ -33,6 +33,7 @@ namespace AMDiS {
MacroInfo
*
macroInfo
=
new
MacroInfo
();
macroInfo
->
readAMDiSMacro
(
filename
,
mesh
);
#if 0
std::deque<MacroElement*>::iterator mel = macroInfo->mel.begin();
int **melVertex = macroInfo->mel_vertex;
WorldVector<double> *coords = macroInfo->coords;
...
...
@@ -244,9 +245,8 @@ namespace AMDiS {
}
}
if
(
!
macroInfo
->
bound_set
)
{
if (!macroInfo->bound_set)
macroInfo->dirichletBoundary();
}
if (mesh->getDim() > 1)
boundaryDOFs(mesh);
...
...
@@ -315,6 +315,7 @@ namespace AMDiS {
macroTest(mesh, filenew);
}
}
#endif
return
macroInfo
;
}
...
...
@@ -352,6 +353,10 @@ namespace AMDiS {
for
(
int
i
=
0
;
i
<
nv
;
i
++
)
dof
[
i
]
=
mesh
->
getDOF
(
VERTEX
);
std
::
cout
<<
"REMOVE THIS RETURN!"
<<
std
::
endl
;
return
;
for
(
int
i
=
0
;
i
<
ne
;
i
++
)
{
mel
[
i
]
->
element
=
mesh
->
createNewElement
();
mel
[
i
]
->
index
=
i
;
...
...
@@ -493,7 +498,6 @@ namespace AMDiS {
}
fclose
(
file
);
/*******************************************************************************/
/* Test, if there is data for every key and if all is defined in right order. */
/*******************************************************************************/
...
...
@@ -582,8 +586,12 @@ namespace AMDiS {
(
"number of vertices = %d must be bigger than 0
\n
"
,
nv
);
key_def
[
2
]
=
true
;
if
(
key_def
[
3
])
fill
(
mesh
,
ne
,
nv
);
if
(
key_def
[
3
])
fill
(
mesh
,
ne
,
nv
);
std
::
cout
<<
"REMOVE THIS RETURN"
<<
std
::
endl
;
return
;
break
;
case
3
:
...
...
@@ -659,7 +667,7 @@ namespace AMDiS {
key_def
[
6
]
=
true
;
break
;
case
7
:
case
7
:
// block "element neighbours"
fscanf
(
file
,
"%*s %*s"
);
...
...
@@ -802,6 +810,8 @@ namespace AMDiS {
}
}
return
;
if
(
ind
)
delete
ind
;
...
...
AMDiS/src/Mesh.cc
View file @
99ad7c08
...
...
@@ -1125,13 +1125,13 @@ namespace AMDiS {
if
(
macroFilename
.
length
())
{
macroFileInfo
=
MacroReader
::
readMacro
(
macroFilename
.
c_str
(),
this
,
periodicFile
==
""
?
NULL
:
periodicFile
.
c_str
(),
check
);
periodicFile
==
""
?
NULL
:
periodicFile
.
c_str
(),
check
);
// If there is no value file which should be written, we can delete
// the information of the macro file.
if
(
!
valueFilename
.
length
())
clearMacroFileInfo
();
//
if (!valueFilename.length())
//
clearMacroFileInfo();
}
initialized
=
true
;
...
...
AMDiS/src/ParallelDomainVec.cc
View file @
99ad7c08
...
...
@@ -54,8 +54,12 @@ namespace AMDiS {
{
FUNCNAME
(
"ParallelDomainVec::initParallelization()"
);
std
::
cout
<<
"TEST RHS 1 "
<<
probVec
->
getRHS
()
->
getDOFVector
(
0
)
<<
": "
<<
probVec
->
getRHS
()
->
getDOFVector
(
0
)
->
getCoarsenOperation
()
<<
std
::
endl
;
ParallelDomainBase
::
initParallelization
(
adaptInfo
);
std
::
cout
<<
"TEST RHS 2 "
<<
probVec
->
getRHS
()
->
getDOFVector
(
0
)
<<
": "
<<
probVec
->
getRHS
()
->
getDOFVector
(
0
)
->
getCoarsenOperation
()
<<
std
::
endl
;
for
(
int
i
=
0
;
i
<
nComponents
;
i
++
)
{
for
(
int
j
=
0
;
j
<
nComponents
;
j
++
)
if
(
probVec
->
getSystemMatrix
(
i
,
j
))
...
...
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