Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
iwr
amdis
Commits
283571c7
Commit
283571c7
authored
Dec 21, 2009
by
Thomas Witkowski
Browse files
Code refactoring.
parent
02381b65
Changes
23
Expand all
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
283571c7
...
...
@@ -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,25 +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 -O2"
# 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
=
.
|
/usr
/bin/sed
's,/\.$,,'
`
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"
...
...
@@ -174,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"
...
...
@@ -328,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
=
`
echo
"
/lib64 /usr/lib64 /usr/local/lib64
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
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"
`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib
64
/usr/lib
64
/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/Pathscale
3.
0
/lib
/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-2.9.9 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4
/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -6763,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"
...
...
@@ -6785,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.
...
...
@@ -6801,25 +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 -O2"
# A language-specific compiler.
CC
=
"
/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC
"
CC
=
"
g++
"
# Is the compiler the GNU C compiler?
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
|
/usr
/bin/sed
's,/\.$,,'
`
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"
...
...
@@ -6893,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"
...
...
@@ -6948,11 +6948,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a
# shared library.
predep_objects
=
`
echo
"/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"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
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
=
`
echo
"/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"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
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.
...
...
@@ -6960,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
=
`
echo
"-L/usr/lib
64 -L/licsoft/libraries/openmpi/1.2.6/64bit/lib -L/usr/lib64/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/../../.."
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
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"
`
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
...
...
@@ -7044,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
=
`
echo
"
/lib64 /usr/lib64 /usr/local/lib64
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
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"
`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib
64
/usr/lib
64
/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/Pathscale
3.
0
/lib
/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-2.9.9 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4
/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -7071,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"
...
...
@@ -7093,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.
...
...
@@ -7109,7 +7109,7 @@ 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 -O2"
...
...
@@ -7118,16 +7118,16 @@ LTCFLAGS="-g -O2"
CC
=
"g77"
# Is the compiler the GNU C compiler?
with_gcc
=
with_gcc
=
yes
gcc_dir
=
`
gcc
-print-file-name
=
.
|
/usr
/bin/sed
's,/\.$,,'
`
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"
...
...
@@ -7355,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
=
`
echo
"
/lib64 /usr/lib64 /usr/local/lib64
"
|
$SED
-e
"s@
${
gcc_dir
}
@
\$
{gcc_dir}@g;s@
${
gcc_ver
}
@
\$
{gcc_ver}@g"
`
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"
`
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec
=
"/lib
64
/usr/lib
64
/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/Pathscale
3.
0
/lib
/2.9.99/32 /work/licsoft/compilers/pgi/linux86-64/6.2/lib /work/licsoft/compilers/pgi/linux86-64/6.2
/lib
so
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-2.9.9 /usr/lib/qt-
3.
3
/lib
/usr/lib/qt4
/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
AMDiS/src/AMDiS_fwd.h
View file @
283571c7
...
...
@@ -49,6 +49,7 @@ namespace AMDiS {
class
FillInfo
;
class
FileWriterInterface
;
class
FiniteElemSpace
;
class
Flag
;
class
IdentityPreconditioner
;
class
ITL_BasePreconditioner
;
class
LeafDataPeriodic
;
...
...
AMDiS/src/Lagrange.cc
View file @
283571c7
...
...
@@ -217,13 +217,13 @@ namespace AMDiS {
{
FUNCNAME
(
"Lagrange::setVertices()"
);
TEST_EXIT_DBG
(
(
*
vertices
)
==
NULL
)(
"vertices != NULL
\n
"
);
TEST_EXIT_DBG
(
*
vertices
==
NULL
)(
"vertices != NULL
\n
"
);
int
dimOfPosition
=
DIM_OF_INDEX
(
position
,
dim
);
*
vertices
=
new
int
[
dimOfPosition
+
1
];
if
(
(
degree
==
4
)
&&
(
dimOfPosition
==
1
)
)
{
if
(
degree
==
4
&&
dimOfPosition
==
1
)
{
(
*
vertices
)[(
nodeIndex
!=
2
)
?
0
:
1
]
=
Global
::
getReferenceElement
(
dim
)
->
getVertexOfPosition
(
position
,
positionIndex
,
...
...
@@ -232,16 +232,16 @@ namespace AMDiS {
Global
::
getReferenceElement
(
dim
)
->
getVertexOfPosition
(
position
,
positionIndex
,
1
);
}
else
if
(
(
degree
==
4
)
&&
(
dimOfPosition
==
2
)
)
{
}
else
if
(
degree
==
4
&&
dimOfPosition
==
2
)
{
for
(
int
i
=
0
;
i
<
dimOfPosition
+
1
;
i
++
)
{
(
*
vertices
)[(
i
+
dimOfPosition
*
nodeIndex
)
%
(
dimOfPosition
+
1
)]
=
(
*
vertices
)[(
i
+
dimOfPosition
*
nodeIndex
)
%
(
dimOfPosition
+
1
)]
=
Global
::
getReferenceElement
(
dim
)
->
getVertexOfPosition
(
position
,
positionIndex
,
i
);
}
}
else
{
for
(
int
i
=
0
;
i
<
dimOfPosition
+
1
;
i
++
)
{
(
*
vertices
)[(
i
+
nodeIndex
)
%
(
dimOfPosition
+
1
)]
=
(
*
vertices
)[(
i
+
nodeIndex
)
%
(
dimOfPosition
+
1
)]
=
Global
::
getReferenceElement
(
dim
)
->
getVertexOfPosition
(
position
,
positionIndex
,
i
);
...
...
@@ -661,10 +661,10 @@ namespace AMDiS {
int
partsAtPos
=
Global
::
getGeo
(
INDEX_OF_DIM
(
i
,
dim
),
dim
);
for
(
int
j
=
0
;
j
<
partsAtPos
;
j
++
)
{
// for all vertices/edges/faces/...
int
*
coordInd
=
new
int
[
i
+
1
];
// indices of relevant coords
for
(
int
k
=
0
;
k
<
i
+
1
;
k
++
)
{
for
(
int
k
=
0
;
k
<
i
+
1
;
k
++
)
coordInd
[
k
]
=
Global
::
getReferenceElement
(
dim
)
->
getVertexOfPosition
(
INDEX_OF_DIM
(
i
,
dim
),
j
,
k
);
}
createCoords
(
coordInd
,
i
+
1
,
0
,
degree
);
delete
[]
coordInd
;
if
(
static_cast
<
int
>
(
bary
->
size
())
==
nBasFcts
)
...
...
@@ -785,17 +785,15 @@ namespace AMDiS {
for
(
int
j
=
offset
;
j
<
jto
;
j
++
)
{
boundaryType
=
el_info
->
getBoundary
(
j
);
int
kto
=
(
*
nDOF
)[
INDEX_OF_DIM
(
i
,
dim
)];
for
(
int
k
=
0
;
k
<
kto
;
k
++
)
{
bound
[
index
++
]
=
boundaryType
;
}
for
(
int
k
=
0
;
k
<
kto
;
k
++
)
bound
[
index
++
]
=
boundaryType
;
}
offset
-=
Global
::
getGeo
(
INDEX_OF_DIM
(
i
+
1
,
dim
),
dim
);
}
// interior nodes in the center
for
(
int
i
=
0
;
i
<
(
*
nDOF
)[
CENTER
];
i
++
)
{
bound
[
index
++
]
=
INTERIOR
;
}
for
(
int
i
=
0
;
i
<
(
*
nDOF
)[
CENTER
];
i
++
)
bound
[
index
++
]
=
INTERIOR
;
TEST_EXIT_DBG
(
index
==
nBasFcts
)(
"found not enough boundarys
\n
"
);
}
...
...
AMDiS/src/LeafData.cc
View file @
283571c7
...
...
@@ -203,10 +203,7 @@ namespace AMDiS {
LeafDataPeriodic
*
ld
[
2
]
=
{
NULL
,
NULL
};
std
::
list
<
LeafDataPeriodic
::
PeriodicInfo
>::
iterator
it
;
for
(
it
=
periodicInfoList
.
begin
();
it
!=
periodicInfoList
.
end
();
++
it
)
{
for
(
it
=
periodicInfoList
.
begin
();
it
!=
periodicInfoList
.
end
();
++
it
)
{
BoundaryType
type
=
it
->
type
;
int
parentSide
=
it
->
elementSide
;
int
mode
=
it
->
periodicMode
;
...
...
@@ -242,8 +239,7 @@ namespace AMDiS {
newCoords
*=
0.5
;
coords
[
j
]
=
newCoords
;
}
else
{
int
posAtSide
=
parent
->
getPositionOfVertex
(
parentSide
,
parentVertex
);
int
posAtSide
=
parent
->
getPositionOfVertex
(
parentSide
,
parentVertex
);
coords
[
j
]
=
(
*
(
it
->
periodicCoords
))[
posAtSide
];
}
}
...
...
AMDiS/src/Line.cc
View file @
283571c7
...
...
@@ -15,10 +15,10 @@ namespace AMDiS {
{
-
1
,
1
}};
int
Line
::
getVertexOfPosition
(
GeoIndex
position
,
int
positionIndex
,
int
vertexIndex
)
const
int
positionIndex
,
int
vertexIndex
)
const
{
FUNCNAME
(
"Line::getVertexOfPosition"
);
FUNCNAME
(
"Line::getVertexOfPosition
()
"
);
switch
(
position
)
{
case
VERTEX
:
...
...
AMDiS/src/MacroReader.cc
View file @
283571c7
This diff is collapsed.
Click to expand it.
AMDiS/src/MacroWriter.cc
View file @
283571c7
...
...
@@ -80,9 +80,8 @@ namespace AMDiS {
std
::
list
<
VertexInfo
>::
iterator
it2
;
for
(
it2
=
it
->
begin
();
it2
!=
it
->
end
();
++
it2
)
{
it2
->
outputIndex
=
counter
++
;
for
(
i
=
0
;
i
<
dow
;
i
++
)
{
file
<<
std
::
scientific
<<
it2
->
coords
[
i
]
<<
" "
;
}
for
(
i
=
0
;
i
<
dow
;
i
++
)
file
<<
std
::
scientific
<<
it2
->
coords
[
i
]
<<
" "
;
file
<<
std
::
endl
;
}
}
...
...
@@ -95,10 +94,9 @@ namespace AMDiS {
for
(
elementIt
=
elements
->
begin
();
elementIt
!=
elements
->
end
();
++
elementIt
)
{
// for all vertices
for
(
i
=
0
;
i
<
vertices
;
i
++
)
{
file
<<
elementIt
->
vertexInfo
[
i
]
->
outputIndex
<<
" "
;
}
file
<<
std
::
endl
;
for
(
i
=
0
;
i
<
vertices
;
i
++
)
file
<<
elementIt
->
vertexInfo
[
i
]
->
outputIndex
<<
" "
;
file
<<
"
\n
"
;
}
// === print boundaries ===
...
...
@@ -106,10 +104,9 @@ namespace AMDiS {
for
(
elementIt
=
elements
->
begin
();
elementIt
!=
elements
->
end
();
++
elementIt
)
{
// for all vertices
for
(
i
=
0
;
i
<
vertices
;
i
++
)
{
file
<<
elementIt
->
boundary
[
i
]
<<
" "
;
}
file
<<
std
::
endl
;
for
(
i
=
0
;
i
<
vertices
;
i
++
)
file
<<
elementIt
->
boundary
[
i
]
<<
" "
;
file
<<
"
\n
"
;
}
// === print neighbours ===
...
...
@@ -117,10 +114,9 @@ namespace AMDiS {
for
(
elementIt
=
elements
->
begin
();
elementIt
!=
elements
->
end
();
++
elementIt
)
{
// for all vertices
for
(
i
=
0
;
i
<
vertices
;
i
++
)
{
file
<<
elementIt
->
neighbour
[
i
]
<<
" "
;
}
file
<<
std
::
endl
;
for
(
i
=
0
;
i
<
vertices
;
i
++
)
file
<<
elementIt
->
neighbour
[
i
]
<<
" "
;
file
<<
"
\n
"
;
}
// === print boundary projections ===
...
...
@@ -158,13 +154,12 @@ namespace AMDiS {
file
<<
std
::
endl
<<
"element type:"
<<
std
::
endl
;
for
(
elementIt
=
elements
->
begin
();
elementIt
!=
elements
->
end
();
++
elementIt
)
file
<<
(
int
)(
elementIt
->
type
)
<<
" "
;
file
<<
(
int
)(
elementIt
->
type
)
<<
" "
;
}
file
.
close
();
return
(
0
)
;
return
0
;
}
...
...
@@ -185,8 +180,7 @@ namespace AMDiS {
// Iterate on all periodic connections
for
(
periodicIt
=
dc
->
getPeriodicInfos
()
->
begin
();
periodicIt
!=
dc
->
getPeriodicInfos
()
->
end
();
++
periodicIt
)
{
periodicIt
!=
dc
->
getPeriodicInfos
()
->
end
();
++
periodicIt
)
{
std
::
map
<
int
,
int
>::
iterator
mapIt
;
...
...
AMDiS/src/Marker.cc
View file @
283571c7
...
...
@@ -24,7 +24,8 @@ namespace AMDiS {
case
4
:
marker
=
new
GERSMarker
(
name
,
row
);
break
;
default:
ERROR_EXIT
(
"invalid strategy
\n
"
);
default:
ERROR_EXIT
(
"invalid strategy
\n
"
);
}
return
marker
;
...
...
@@ -50,7 +51,8 @@ namespace AMDiS {
INFO
(
info
,
4
)(
"%d elements marked for coarsening
\n
"
,
elMarkCoarsen
);
}
void
Marker
::
markElement
(
AdaptInfo
*
adaptInfo
,
ElInfo
*
elInfo
)
{
void
Marker
::
markElement
(
AdaptInfo
*
adaptInfo
,
ElInfo
*
elInfo
)
{
Element
*
el
=
elInfo
->
getElement
();
double
lError
=
el
->
getEstimation
(
row
);
...
...
AMDiS/src/Mesh.cc
View file @
283571c7
...
...
@@ -592,12 +592,11 @@ namespace AMDiS {
Element
*
el
=
parent
?
parent
->
clone
()
:
elementPrototype
->
clone
();
if
(
!
parent
&&
elementDataPrototype
)
{
if
(
!
parent
&&
elementDataPrototype
)
el
->
setElementData
(
elementDataPrototype
->
clone
());
}
else
{
else
el
->
setElementData
(
NULL
);
// must be done in ElementData::refineElementData()
}
return
el
;
}
...
...
@@ -629,14 +628,12 @@ namespace AMDiS {
{
static
const
MacroElement
*
mel
=
NULL
;
DimVec
<
double
>
lambda
(
dim
,
NO_INIT
);
ElInfo
*
mel_info
=
NULL
;
mel_info
=
createNewElInfo
();
ElInfo
*
mel_info
=
createNewElInfo
();
if
(
start_mel
!=
NULL
)
mel
=
start_mel
;
else
if
(
(
mel
==
NULL
)
||
(
mel
->
getElement
()
->
getMesh
()
!=
this
)
)
if
(
mel
==
NULL
||
mel
->
getElement
()
->
getMesh
()
!=
this
)
mel
=
*
(
macroElements
.
begin
());
mel_info
->
setFillFlag
(
Mesh
::
FILL_COORDS
);
...
...
@@ -689,6 +686,7 @@ namespace AMDiS {
ElInfo
*
final_el_info
)
{
FUNCNAME
(
"Mesh::findElementAtPointRecursive()"
);
Element
*
el
=
el_info
->
getElement
();
DimVec
<
double
>
c_lambda
(
dim
,
NO_INIT
);
int
inside
;
...
...
@@ -697,21 +695,20 @@ namespace AMDiS {
if
(
el
->
isLeaf
())
{
*
final_el_info
=
*
el_info
;
if
(
outside
<
0
)
{
for
(
int
i
=
0
;
i
<=
dim
;
i
++
)
{
for
(
int
i
=
0
;
i
<=
dim
;
i
++
)
final_lambda
[
i
]
=
lambda
[
i
];
}
return
true
;
}
else
{
/* outside */
if
(
g_xy0
)
{
/* find boundary point of [xy0, xy] */
el_info
->
worldToCoord
(
*
(
g_xy0
),
&
c_lambda
);
double
s
=
lambda
[
outside
]
/
(
lambda
[
outside
]
-
c_lambda
[
outside
]);
for
(
int
i
=
0
;
i
<=
dim
;
i
++
)
{
final_lambda
[
i
]
=
s
*
c_lambda
[
i
]
+
(
1.0
-
s
)
*
lambda
[
i
];
}
if
(
g_sp
)
{
for
(
int
i
=
0
;
i
<=
dim
;
i
++
)
final_lambda
[
i
]
=
s
*
c_lambda
[
i
]
+
(
1.0
-
s
)
*
lambda
[
i
];
if
(
g_sp
)
*
(
g_sp
)
=
s
;
}
if
(
dim
==
3
)
MSG
(
"outside finest level on el %d: s=%.3e
\n
"
,
el
->
getIndex
(),
s
);
...
...
@@ -729,7 +726,7 @@ namespace AMDiS {
c_el_info
->
fillElInfo
(
0
,
el_info
);
if
(
outside
>=
0
)
{
outside
=
el_info
->
worldToCoord
(
*
(
g_xy
),
&
c_lambda
);
if
(
outside
>
=
0
)
ERROR
(
"point outside domain
\n
"
);
TEST_EXIT
(
outside
=
=
0
)(
"point outside domain
\n
"
);
}
else
{
c_lambda
[
0
]
=
lambda
[
0
]
-
lambda
[
1
];
c_lambda
[
1
]
=
2.0
*
lambda
[
1
];
...
...
@@ -738,7 +735,7 @@ namespace AMDiS {
c_el_info
->
fillElInfo
(
1
,
el_info
);
if
(
outside
>=
0
)
{
outside
=
el_info
->
worldToCoord
(
*
(
g_xy
),
&
c_lambda
);
if
(
outside
>
=
0
)
ERROR
(
"point outside domain
\n
"
);
TEST_EXIT
(
outside
=
=
0
)(
"point outside domain
\n
"
);
}
else
{
c_lambda
[
1
]
=
lambda
[
1
]
-
lambda
[
0
];
c_lambda
[
0
]
=
2.0
*
lambda
[
0
];
...
...
@@ -751,9 +748,7 @@ namespace AMDiS {
c_el_info
->
fillElInfo
(
0
,
el_info
);
if
(
el
->
isNewCoordSet
())
{
outside
=
c_el_info
->
worldToCoord
(
*
(
g_xy
),
&
c_lambda
);
if
(
outside
>=
0
)
{
ERROR
(
"outside curved boundary child 0
\n
"
);
}
TEST_EXIT
(
outside
==
0
)(
"outside curved boundary child 0
\n
"
);
}
else
{
c_lambda
[
0
]
=
lambda
[
2
];
c_lambda
[
1
]
=
lambda
[
0
]
-
lambda
[
1
];
...
...
@@ -763,9 +758,7 @@ namespace AMDiS {
c_el_info
->
fillElInfo
(
1
,
el_info
);
if
(
el
->
isNewCoordSet
())
{
outside
=
c_el_info
->
worldToCoord
(
*
(
g_xy
),
&
c_lambda
);
if
(
outside
>=
0
)
{
ERROR
(
"outside curved boundary child 1
\n
"
);
}
TEST_EXIT
(
outside
==
0
)(
"outside curved boundary child 1
\n
"
);
}
else
{
c_lambda
[
0
]
=
lambda
[
1
]
-
lambda
[
0
];
c_lambda
[
1
]
=
lambda
[
2
];
...
...
@@ -785,11 +778,10 @@ namespace AMDiS {
if
(
c_outside
>=
0
)
{
/* test is other child is better... */
DimVec
<
double
>
c_lambda2
(
dim
,
NO_INIT
);
int
c_outside2
;
ElInfo
*
c_el_info2
=
createNewElInfo
();
c_el_info2
->
fillElInfo
(
1
-
ichild
,
el_info
);
c_outside2
=
c_el_info2
->
worldToCoord
(
*
(
g_xy
),
&
c_lambda2
);
int
c_outside2
=
c_el_info2
->
worldToCoord
(
*
(
g_xy
),
&
c_lambda2
);
MSG
(
"new_coord CHILD %d: outside=%d, lambda=(%.2f %.2f %.2f %.2f)
\n
"
,
ichild
,
c_outside
,
c_lambda
[
0
],
c_lambda
[
1
],
c_lambda
[
2
],
c_lambda
[
3
]);
...
...
@@ -832,8 +824,7 @@ namespace AMDiS {
}
}
/* DIM == 3 */
inside
=
findElementAtPointRecursive
(
c_el_info
,
c_lambda
,
outside
,
final_el_info
);
inside
=
findElementAtPointRecursive
(
c_el_info
,
c_lambda
,
outside
,
final_el_info
);
delete
c_el_info
;
return
inside
;
...
...
AMDiS/src/Operator.cc
View file @
283571c7
...
...
@@ -1255,8 +1255,6 @@ namespace AMDiS {
auxFESpaces
.
push_back
(
dv
->
getFESpace
());
}
void
MatrixFct_SOT
::
initElement
(
const
ElInfo
*
elInfo
,
SubAssembler
*
subAssembler
,
Quadrature
*
quad
)
...
...
@@ -1428,8 +1426,7 @@ namespace AMDiS {
SubAssembler
*
subAssembler
,
Quadrature
*
quad
)
{
TEST_EXIT
(
vec1
->
getFESpace
()
==
vec2
->
getFESpace
())
(
"Not yet implemented!
\n
"
);
TEST_EXIT
(
vec1
->
getFESpace
()
==
vec2
->
getFESpace
())(
"Not yet implemented!
\n
"
);
vecAtQPs1
=
getVectorAtQPs
(
vec1
,
smallElInfo
,
largeElInfo
,
subAssembler
,
quad
);
vecAtQPs2
=
getVectorAtQPs
(
vec2
,
smallElInfo
,
largeElInfo
,
subAssembler
,
quad
);
...
...
@@ -1865,7 +1862,8 @@ namespace AMDiS {
}