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
318f08da
Commit
318f08da
authored
Oct 14, 2010
by
Thomas Witkowski
Browse files
Small bug fix.
parent
8f1a5984
Changes
2
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
318f08da
...
@@ -85,7 +85,7 @@ NM="/usr/bin/nm -B"
...
@@ -85,7 +85,7 @@ NM="/usr/bin/nm -B"
LN_S
=
"ln -s"
LN_S
=
"ln -s"
# What is the maximum length of a command?
# What is the maximum length of a command?
max_cmd_len
=
157286
4
max_cmd_len
=
9830
4
# Object file suffix (normally "o").
# Object file suffix (normally "o").
objext
=
o
objext
=
o
...
@@ -128,7 +128,7 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
...
@@ -128,7 +128,7 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
old_postuninstall_cmds
=
""
old_postuninstall_cmds
=
""
# A C compiler.
# A C compiler.
LTCC
=
"
/usr/lib64/mpi/gcc/openmpi//bin/mpi
cc"
LTCC
=
"
g
cc"
# LTCC compiler flags.
# LTCC compiler flags.
LTCFLAGS
=
"-g -O2"
LTCFLAGS
=
"-g -O2"
...
@@ -233,10 +233,10 @@ finish_eval=""
...
@@ -233,10 +233,10 @@ finish_eval=""
hardcode_into_libs
=
yes
hardcode_into_libs
=
yes
# Compile-time system search path for libraries.
# Compile-time system search path for libraries.
sys_lib_search_path_spec
=
"/usr/lib64/gcc/x86_64-suse-linux/4.
5
/usr/lib64 /lib64 /usr/x86_64-suse-linux/lib"
sys_lib_search_path_spec
=
"/usr/lib64/gcc/x86_64-suse-linux/4.
1.2
/usr/lib64 /lib64
/fastfs/wir/local/lib
/usr/x86_64-suse-linux/lib"
# Run-time system search path for libraries.
# Run-time system search path for libraries.
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/X11R6/lib64/Xaw3d /usr/X11R6/lib64
/usr/lib64/Xaw3d
/usr/X11R6/lib/Xaw3d /usr/X11R6/lib
/usr/lib/Xaw3d
/usr/x86_64-suse-linux/lib /usr/local/lib
/opt/kde3/lib /lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /opt/kde3/lib64 /usr/lib64/graphviz /usr/lib64/graphviz/sharp /usr/lib64/graphviz/java /usr/lib64/graphviz/perl /usr/lib64/graphviz/php /usr/lib64/graphviz/ocaml /usr/lib64/graphviz/python /usr/lib64/graphviz/lua /usr/lib64/graphviz/tcl /usr/lib64/graphviz/guile /usr/lib64/graphviz/ruby /usr/lib64/octave-3.2.4
"
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/lib
64 /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
"
# Whether dlopen is supported.
# Whether dlopen is supported.
dlopen_support
=
unknown
dlopen_support
=
unknown
...
@@ -259,7 +259,7 @@ LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
...
@@ -259,7 +259,7 @@ LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
old_archive_cmds
=
"
\$
AR
\$
AR_FLAGS
\$
oldlib
\$
oldobjs~
\$
RANLIB
\$
oldlib"
old_archive_cmds
=
"
\$
AR
\$
AR_FLAGS
\$
oldlib
\$
oldobjs~
\$
RANLIB
\$
oldlib"
# A language specific compiler.
# A language specific compiler.
CC
=
"
/usr/lib64/mpi/gcc/openmpi//bin/mpi
cc"
CC
=
"
g
cc"
# Is the compiler the GNU compiler?
# Is the compiler the GNU compiler?
with_gcc
=
yes
with_gcc
=
yes
...
@@ -274,7 +274,7 @@ wl="-Wl,"
...
@@ -274,7 +274,7 @@ wl="-Wl,"
pic_flag
=
" -fPIC -DPIC"
pic_flag
=
" -fPIC -DPIC"
# Compiler flag to prevent dynamic linking.
# Compiler flag to prevent dynamic linking.
link_static_flag
=
""
link_static_flag
=
"
-static
"
# Does compiler simultaneously support -c and -o options?
# Does compiler simultaneously support -c and -o options?
compiler_c_o
=
"yes"
compiler_c_o
=
"yes"
...
@@ -8914,7 +8914,7 @@ LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
...
@@ -8914,7 +8914,7 @@ LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
old_archive_cmds
=
"
\$
AR
\$
AR_FLAGS
\$
oldlib
\$
oldobjs~
\$
RANLIB
\$
oldlib"
old_archive_cmds
=
"
\$
AR
\$
AR_FLAGS
\$
oldlib
\$
oldobjs~
\$
RANLIB
\$
oldlib"
# A language specific compiler.
# A language specific compiler.
CC
=
"
/usr/lib64/mpi/gcc/openmpi//bin/mpicxx
"
CC
=
"
g++
"
# Is the compiler the GNU compiler?
# Is the compiler the GNU compiler?
with_gcc
=
yes
with_gcc
=
yes
...
@@ -8929,7 +8929,7 @@ wl="-Wl,"
...
@@ -8929,7 +8929,7 @@ wl="-Wl,"
pic_flag
=
" -fPIC -DPIC"
pic_flag
=
" -fPIC -DPIC"
# Compiler flag to prevent dynamic linking.
# Compiler flag to prevent dynamic linking.
link_static_flag
=
""
link_static_flag
=
"
-static
"
# Does compiler simultaneously support -c and -o options?
# Does compiler simultaneously support -c and -o options?
compiler_c_o
=
"yes"
compiler_c_o
=
"yes"
...
@@ -9039,17 +9039,17 @@ file_list_spec=""
...
@@ -9039,17 +9039,17 @@ file_list_spec=""
hardcode_action
=
immediate
hardcode_action
=
immediate
# The directories searched by this compiler when creating a shared library.
# The directories searched by this compiler when creating a shared library.
compiler_lib_search_dirs
=
"
/usr/lib64/mpi/gcc/openmpi/lib64
/usr/lib64/gcc/x86_64-suse-linux/4.
5
/usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../../../x86_64-suse-linux/lib /usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../.."
compiler_lib_search_dirs
=
"/usr/lib64/gcc/x86_64-suse-linux/4.
1.2
/usr/lib64/gcc/x86_64-suse-linux/4.
1.2
/../../../../lib64 /lib/../lib64 /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
/../../.."
# Dependencies to place before and after the objects being linked to
# Dependencies to place before and after the objects being linked to
# create a shared library.
# create a shared library.
predep_objects
=
"/usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../../../lib64/crti.o /usr/lib64/gcc/x86_64-suse-linux/4.
5
/crtbeginS.o"
predep_objects
=
"/usr/lib64/gcc/x86_64-suse-linux/4.
1.2
/../../../../lib64/crti.o /usr/lib64/gcc/x86_64-suse-linux/4.
1.2
/crtbeginS.o"
postdep_objects
=
"/usr/lib64/gcc/x86_64-suse-linux/4.
5
/crtendS.o /usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../../../lib64/crtn.o"
postdep_objects
=
"/usr/lib64/gcc/x86_64-suse-linux/4.
1.2
/crtendS.o /usr/lib64/gcc/x86_64-suse-linux/4.
1.2
/../../../../lib64/crtn.o"
predeps
=
""
predeps
=
""
postdeps
=
"
-lmpi_cxx -lmpi -lopen-rte -lopen-pal -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
# The library search path used internally by the compiler when linking
# a shared library.
# a shared library.
compiler_lib_search_path
=
"
-L/usr/lib64/mpi/gcc/openmpi/lib64
-L/usr/lib64/gcc/x86_64-suse-linux/4.
5
-L/usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../../../x86_64-suse-linux/lib -L/usr/lib64/gcc/x86_64-suse-linux/4.
5
/../../.."
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
/../../.."
# ### END LIBTOOL TAG CONFIG: CXX
# ### END LIBTOOL TAG CONFIG: CXX
AMDiS/src/ProblemVec.cc
View file @
318f08da
...
@@ -197,13 +197,14 @@ namespace AMDiS {
...
@@ -197,13 +197,14 @@ namespace AMDiS {
&
globalRefinements
);
&
globalRefinements
);
#endif
#endif
// Initialize the meshes if there is no serialization file.
bool
initMesh
=
initFlag
.
isSet
(
INIT_MESH
)
||
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
meshes
.
size
());
i
++
)
{
(
adoptProblem
&&
adoptFlag
.
isSet
(
INIT_MESH
));
bool
initMesh
=
initFlag
.
isSet
(
INIT_MESH
);
// Initialize the meshes if there is no serialization file.
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
meshes
.
size
());
i
++
)
if
(
initMesh
&&
meshes
[
i
]
&&
!
(
meshes
[
i
]
->
isInitialized
()))
if
(
initMesh
&&
meshes
[
i
]
&&
!
(
meshes
[
i
]
->
isInitialized
()))
meshes
[
i
]
->
initialize
();
meshes
[
i
]
->
initialize
();
}
// === read value file and use it for the mesh values ===
// === read value file and use it for the mesh values ===
std
::
string
valueFilename
(
""
);
std
::
string
valueFilename
(
""
);
...
@@ -218,12 +219,9 @@ namespace AMDiS {
...
@@ -218,12 +219,9 @@ namespace AMDiS {
// === do global refinements ===
// === do global refinements ===
for
(
unsigned
int
i
=
0
;
i
<
meshes
.
size
();
i
++
)
{
for
(
unsigned
int
i
=
0
;
i
<
meshes
.
size
();
i
++
)
bool
initMesh
=
initFlag
.
isSet
(
INIT_MESH
);
if
(
initMesh
&&
meshes
[
i
])
if
(
initMesh
&&
meshes
[
i
])
refinementManager
->
globalRefine
(
meshes
[
i
],
globalRefinements
);
refinementManager
->
globalRefine
(
meshes
[
i
],
globalRefinements
);
}
}
}
}
}
...
...
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