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
501bcc75
Commit
501bcc75
authored
Jun 22, 2009
by
Thomas Witkowski
Browse files
nix.
parent
0fcade3f
Changes
8
Hide whitespace changes
Inline
Side-by-side
AMDiS/libtool
View file @
501bcc75
...
...
@@ -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
p2q001
:
# 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,13 +82,13 @@ 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
...
...
@@ -97,7 +97,7 @@ with_gcc=yes
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 +171,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"
...
...
@@ -325,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
=
" /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/../../../
..
/lib
64/ /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/"
sys_lib_search_path_spec
=
" /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/"
# 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.9
9
/
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
/lib
so
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-
2.9.9 /
usr/lib/qt-3.3
/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -6760,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
p2q001
:
# Libtool was configured on host
NWRW15
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -6782,12 +6782,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,13 +6798,13 @@ 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
...
...
@@ -6813,7 +6813,7 @@ with_gcc=yes
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 +6887,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 +6942,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
=
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../crti.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtbeginS.o"
# 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
=
"/usr/lib/gcc/
i386-redhat
-linux/4.1.2/crtendS.o /usr/lib/gcc/
i386-redhat
-linux/4.1.2/../../../crtn.o"
# Dependencies to place before the objects being linked to create a
# shared library.
...
...
@@ -6954,11 +6954,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/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/../../.."
compiler_lib_search_path
=
"-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/../../.."
# Method to check whether dependent libraries are shared objects.
deplibs_check_method
=
"pass_all"
...
...
@@ -7038,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
=
" /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/../../../
..
/lib
64/ /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/"
sys_lib_search_path_spec
=
" /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/"
# 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.9
9
/
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
/lib
so
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-
2.9.9 /
usr/lib/qt-3.3
/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
@@ -7065,7 +7065,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host
p2q001
:
# Libtool was configured on host
NWRW15
:
# Shell to use when invoking shell scripts.
SHELL
=
"/bin/sh"
...
...
@@ -7087,12 +7087,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,7 +7103,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"
...
...
@@ -7112,13 +7112,13 @@ LTCFLAGS="-g -O2"
CC
=
"g77"
# Is the compiler the GNU C compiler?
with_gcc
=
with_gcc
=
yes
# 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"
...
...
@@ -7346,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
=
" /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
=
" /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/"
# 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.9
9
/
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
/lib
so
"
sys_lib_dlsearch_path_spec
=
"/lib /usr/lib /usr/
lib/octave-
2.9.9 /
usr/lib/qt-3.3
/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path
=
""
...
...
AMDiS/src/DOFMatrix.cc
View file @
501bcc75
...
...
@@ -98,8 +98,8 @@ namespace AMDiS {
for
(
cursor_type
cursor
=
begin
<
major
>
(
matrix
),
cend
=
end
<
major
>
(
matrix
);
cursor
!=
cend
;
++
cursor
)
{
for
(
icursor_type
icursor
=
begin
<
nz
>
(
cursor
),
icend
=
end
<
nz
>
(
cursor
);
icursor
!=
icend
;
++
icursor
)
if
(
value
(
*
icursor
)
!=
0.0
)
std
::
cout
<<
"("
<<
row
(
*
icursor
)
<<
","
<<
col
(
*
icursor
)
<<
","
<<
value
(
*
icursor
)
<<
") "
;
std
::
cout
<<
"("
<<
row
(
*
icursor
)
<<
","
<<
col
(
*
icursor
)
<<
","
<<
value
(
*
icursor
)
<<
") "
;
std
::
cout
<<
"
\n
"
;
}
}
...
...
AMDiS/src/Estimator.h
View file @
501bcc75
...
...
@@ -132,8 +132,11 @@ namespace AMDiS {
/// Adds pointer to old solution to the given system.
virtual
void
addUhOldToSystem
(
int
system
,
DOFVector
<
double
>
*
uhOld_
)
{
TEST_EXIT
(
static_cast
<
int
>
(
uhOld
.
size
())
>
system
)(
"invalid system
\n
"
);
TEST_EXIT
(
uhOld
[
system
]
==
NULL
)(
"there is already an uhOld
\n
"
);
FUNCNAME
(
"Estimator::addUhOldToSystem()"
);
TEST_EXIT
(
static_cast
<
int
>
(
uhOld
.
size
())
>
system
)(
"Invalid system!
\n
"
);
TEST_EXIT
(
uhOld
[
system
]
==
NULL
)(
"There is already an uhOld!
\n
"
);
uhOld
[
system
]
=
uhOld_
;
}
...
...
AMDiS/src/ProblemInstat.cc
View file @
501bcc75
...
...
@@ -8,8 +8,6 @@
namespace
AMDiS
{
// === ProblemInstat =================================
ProblemInstat
::~
ProblemInstat
()
{
}
...
...
@@ -88,17 +86,17 @@ namespace AMDiS {
WARNING
(
"no oldSolution created
\n
"
);
}
void
ProblemInstatScal
::
createUhOld
()
{
void
ProblemInstatScal
::
createUhOld
()
{
if
(
oldSolution
)
{
WARNING
(
"oldSolution already created
\n
"
);
}
else
{
// create oldSolution
oldSolution
=
new
DOFVector
<
double
>
(
problemStat
->
getFESpace
(),
name
+
"->uOld"
);
oldSolution
->
setCoarsenOperation
(
COARSE_INTERPOL
);
if
(
problemStat
->
getEstimator
())
{
if
(
problemStat
->
getEstimator
())
dynamic_cast
<
Estimator
*>
(
problemStat
->
getEstimator
())
->
addUhOldToSystem
(
0
,
oldSolution
);
}
}
}
...
...
@@ -121,7 +119,7 @@ namespace AMDiS {
:
ProblemInstat
(
name_
,
initialProb
),
problemStat
(
prob
),
oldSolution
(
NULL
)
{}
;
{}
ProblemInstatVec
::~
ProblemInstatVec
()
{
...
...
@@ -140,9 +138,9 @@ namespace AMDiS {
if
(
oldSolution
)
{
WARNING
(
"oldSolution already created
\n
"
);
}
else
{
if
(
initFlag
.
isSet
(
INIT_UH_OLD
))
{
if
(
initFlag
.
isSet
(
INIT_UH_OLD
))
createUhOld
();
}
if
(
adoptProblem
&&
adoptFlag
.
isSet
(
INIT_UH_OLD
))
{
ProblemInstatVec
*
_adoptProblem
=
dynamic_cast
<
ProblemInstatVec
*>
(
adoptProblem
);
TEST_EXIT
(
_adoptProblem
)(
"can't adopt oldSolution from problem which is not instationary and vectorial"
);
...
...
@@ -155,7 +153,8 @@ namespace AMDiS {
WARNING
(
"no oldSolution created
\n
"
);
}
void
ProblemInstatVec
::
createUhOld
()
{
void
ProblemInstatVec
::
createUhOld
()
{
if
(
oldSolution
)
{
WARNING
(
"oldSolution already created
\n
"
);
}
else
{
...
...
@@ -169,18 +168,21 @@ namespace AMDiS {
name
+
"->uOld"
));
oldSolution
->
getDOFVector
(
i
)
->
setCoarsenOperation
(
COARSE_INTERPOL
);
if
(
problemStat
->
getEstimator
(
i
))
{
problemStat
->
getEstimator
(
i
)
->
addUhOldToSystem
(
i
,
oldSolution
->
getDOFVector
(
i
));
}
if
(
problemStat
->
getEstimator
(
i
))
problemStat
->
getEstimator
(
i
)
->
addUhOldToSystem
(
i
,
oldSolution
->
getDOFVector
(
i
));
}
}
}
void
ProblemInstatScal
::
initTimestep
(
AdaptInfo
*
adaptInfo
)
{
void
ProblemInstatScal
::
initTimestep
(
AdaptInfo
*
adaptInfo
)
{
oldSolution
->
copy
(
*
(
problemStat
->
getSolution
()));
}
void
ProblemInstatVec
::
initTimestep
(
AdaptInfo
*
adaptInfo
)
{
void
ProblemInstatVec
::
initTimestep
(
AdaptInfo
*
adaptInfo
)
{
oldSolution
->
copy
(
*
(
problemStat
->
getSolution
()));
}
}
AMDiS/src/ProblemScal.cc
View file @
501bcc75
...
...
@@ -615,6 +615,8 @@ namespace AMDiS {
#endif
createPrecon
();
systemMatrix
->
print
();
}
void
ProblemScal
::
writeResidualMesh
(
AdaptInfo
*
adaptInfo
,
const
std
::
string
name
)
...
...
AMDiS/src/ProblemVec.cc
View file @
501bcc75
...
...
@@ -192,7 +192,7 @@ namespace AMDiS {
// === read value file and use it for the mesh values ===
std
::
string
valueFilename
(
""
);
GET_PARAMETER
(
0
,
meshes
[
0
]
->
getName
()
+
"->value file name"
,
&
valueFilename
);
if
(
valueFilename
.
length
())
{
if
(
valueFilename
.
length
())
{
ValueReader
::
readValue
(
valueFilename
,
meshes
[
0
],
solution
->
getDOFVector
(
0
),
...
...
@@ -373,8 +373,7 @@ namespace AMDiS {
std
::
string
estimatorType
(
"0"
);
GET_PARAMETER
(
0
,
estName
,
&
estimatorType
);
EstimatorCreator
*
estimatorCreator
=
dynamic_cast
<
EstimatorCreator
*>
(
CreatorMap
<
Estimator
>::
getCreator
(
estimatorType
));
dynamic_cast
<
EstimatorCreator
*>
(
CreatorMap
<
Estimator
>::
getCreator
(
estimatorType
));
if
(
estimatorCreator
)
{
estimatorCreator
->
setName
(
estName
);
estimatorCreator
->
setRow
(
i
);
...
...
AMDiS/src/ResidualParallelEstimator.cc
View file @
501bcc75
...
...
@@ -16,16 +16,14 @@ namespace AMDiS {
seqEstimators_
.
resize
(
omp_get_overall_max_threads
());
for
(
int
i
=
0
;
i
<
omp_get_overall_max_threads
();
i
++
)
{
for
(
int
i
=
0
;
i
<
omp_get_overall_max_threads
();
i
++
)
seqEstimators_
[
i
]
=
new
ResidualEstimator
(
name
,
r
);
}
}
ResidualParallelEstimator
::~
ResidualParallelEstimator
()
{
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
{
delete
seqEstimators_
[
i
];
}
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
delete
seqEstimators_
[
i
];
}
void
ResidualParallelEstimator
::
addSystem
(
DOFMatrix
*
matrix_
,
...
...
@@ -35,9 +33,8 @@ namespace AMDiS {
{
Estimator
::
addSystem
(
matrix_
,
uh_
,
fh_
,
uhOld_
);
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
{
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
seqEstimators_
[
i
]
->
addSystem
(
matrix_
,
uh_
,
fh_
,
uhOld_
);
}
}
void
ResidualParallelEstimator
::
addUhOldToSystem
(
int
system
,
...
...
@@ -45,9 +42,8 @@ namespace AMDiS {
{
Estimator
::
addUhOldToSystem
(
system
,
uhOld_
);
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
{
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
seqEstimators_
[
i
]
->
addUhOldToSystem
(
system
,
uhOld_
);
}
}
double
ResidualParallelEstimator
::
estimate
(
double
ts
)
...
...
@@ -56,9 +52,8 @@ namespace AMDiS {
mesh
=
uh
[
row
==
-
1
?
0
:
row
]
->
getFESpace
()
->
getMesh
();
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
{
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
seqEstimators_
.
size
());
i
++
)
seqEstimators_
[
i
]
->
init
(
ts
);
}
TraverseParallelStack
stack
;
...
...
@@ -100,9 +95,8 @@ namespace AMDiS {
est_t_sum
=
sqrt
(
est_t_sum
);
MSG
(
"estimate = %.8e
\n
"
,
est_sum
);
if
(
C3
)
{
if
(
C3
)
MSG
(
"time estimate = %.8e
\n
"
,
est_t_sum
);
}
return
est_sum
;
}
...
...
AMDiS/src/SolutionDataStorage.h
View file @
501bcc75
...
...
@@ -338,6 +338,8 @@ namespace AMDiS {
int
addMemoryUsage
(
FiniteElemSpace
*
feSpace
)
{
memoryUsage
+=
feSpace
->
getMesh
()
->
calcMemoryUsage
();
return
memoryUsage
;
}
///
...
...
@@ -351,6 +353,8 @@ namespace AMDiS {
meshes
.
push_back
(
feSpaces
[
i
]
->
getMesh
());
}
}
return
memoryUsage
;
}
/// Number of MBytes of memory that can be used for solution storage.
...
...
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