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
eb33f8b2
Commit
eb33f8b2
authored
Jul 06, 2010
by
Thomas Witkowski
Browse files
Some small changes, add tool to compare parallel and sequential matrices and vectors.
parent
8a0c0bba
Changes
4
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
eb33f8b2
...
...
@@ -82,13 +82,13 @@ 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
...
...
@@ -171,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"
...
...
@@ -6798,13 +6798,13 @@ 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/mpicxx
"
# Is the compiler the GNU C compiler?
with_gcc
=
yes
...
...
@@ -6887,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"
...
...
@@ -6954,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
=
"-L/usr/lib64/gcc/x86_64-suse-linux/4.1.2 -L/usr/lib64/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
=
"-L/usr/lib64
-L/licsoft/libraries/openmpi/1.2.6/64bit/lib -L/usr/lib64
/gcc/x86_64-suse-linux/4.1.2 -L/usr/lib64/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"
...
...
@@ -7103,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"
...
...
AMDiS/src/Debug.cc
View file @
eb33f8b2
...
...
@@ -82,11 +82,23 @@ namespace AMDiS {
{
std
::
map
<
int
,
double
>
vec
;
TraverseStack
stack
;
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
mesh
,
-
1
,
Mesh
::
CALL_LEAF_EL
);
ElInfo
*
elInfo
=
stack
.
traverseFirst
(
mesh
,
-
1
,
Mesh
::
CALL_EVERY_EL_PREORDER
);
bool
markChildren
=
false
;
int
markLevel
=
-
1
;
while
(
elInfo
)
{
int
index
=
elInfo
->
getElement
()
->
getIndex
();
vec
[
index
]
=
(
index
==
idx
?
1.0
:
0.0
);
if
(
index
==
idx
)
{
markChildren
=
true
;
markLevel
=
elInfo
->
getLevel
();
}
if
(
markChildren
&&
elInfo
->
getLevel
()
<
markLevel
)
markChildren
=
false
;
if
(
elInfo
->
getElement
()
->
isLeaf
())
vec
[
index
]
=
(
markChildren
?
1.0
:
0.0
);
elInfo
=
stack
.
traverseNext
(
elInfo
);
}
...
...
AMDiS/src/ProblemVec.cc
View file @
eb33f8b2
...
...
@@ -678,8 +678,8 @@ namespace AMDiS {
for
(
int
j
=
0
;
j
<
nComponents
;
j
++
)
{
//
if (writeAsmInfo)
//
MSG("--------- %d %d -------------\n", i, j);
if
(
writeAsmInfo
)
MSG
(
"--------- %d %d -------------
\n
"
,
i
,
j
);
// Only if this variable is true, the current matrix will be assembled.
bool
assembleMatrix
=
true
;
...
...
AMDiS/src/parallel/GlobalMatrixSolver.cc
View file @
eb33f8b2
...
...
@@ -422,8 +422,8 @@ namespace AMDiS {
// === Create PETSc matrix with the computed nnz data structure. ===
MatCreateMPIAIJ
(
PETSC_COMM_WORLD
,
nRankRows
,
nRankRows
,
nOverallRows
,
nOverallRows
,
0
,
d_nnz
,
0
,
o_nnz
,
&
petscMatrix
);
0
,
d_nnz
,
0
,
o_nnz
,
&
petscMatrix
);
INFO
(
info
,
8
)(
"Fill petsc matrix 1 needed %.5f seconds
\n
"
,
TIME_USED
(
first
,
clock
()));
#if (DEBUG != 0)
...
...
@@ -441,7 +441,8 @@ namespace AMDiS {
for
(
int
i
=
0
;
i
<
nComponents
;
i
++
)
for
(
int
j
=
0
;
j
<
nComponents
;
j
++
)
if
((
*
mat
)[
i
][
j
])
setDofMatrix
((
*
mat
)[
i
][
j
],
nComponents
,
i
,
j
);
setDofMatrix
((
*
mat
)[
i
][
j
],
nComponents
,
i
,
j
);
INFO
(
info
,
8
)(
"Fill petsc matrix 2 needed %.5f seconds
\n
"
,
TIME_USED
(
first
,
clock
()));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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