Skip to content

GitLab

Commit 6c978c46 authored by Thomas Witkowski's avatar Thomas Witkowski
Browse files

* ParallelProblemVec debugger

parent 5080eda8
Hide whitespace changes
Inline Side-by-side
AMDiS/libtool
View file @ 6c978c46
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
# the same distribution terms that you use for the rest of that program. # the same distribution terms that you use for the rest of that program.
# A sed program that does not truncate output. # 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. # 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 # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
...@@ -44,7 +44,7 @@ available_tags=" CXX F77" ...@@ -44,7 +44,7 @@ available_tags=" CXX F77"
# ### BEGIN LIBTOOL CONFIG # ### BEGIN LIBTOOL CONFIG
# Libtool was configured on host p2s103: # Libtool was configured on host NWRW15:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
...@@ -66,12 +66,12 @@ fast_install=yes ...@@ -66,12 +66,12 @@ fast_install=yes
# The host system. # The host system.
host_alias= host_alias=
host=x86_64-unknown-linux-gnu host=i686-redhat-linux-gnu
host_os=linux-gnu host_os=linux-gnu
# The build system. # The build system.
build_alias= build_alias=
build=x86_64-unknown-linux-gnu build=i686-redhat-linux-gnu
build_os=linux-gnu build_os=linux-gnu
# An echo program that does not interpret backslashes. # An echo program that does not interpret backslashes.
...@@ -82,25 +82,25 @@ AR="ar" ...@@ -82,25 +82,25 @@ AR="ar"
AR_FLAGS="cru" AR_FLAGS="cru"
# A C compiler. # A C compiler.
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc" LTCC="gcc"
# LTCC compiler flags. # LTCC compiler flags.
LTCFLAGS="-g -O2" LTCFLAGS="-g -O2"
# A language-specific compiler. # A language-specific compiler.
CC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc" CC="gcc"
# Is the compiler the GNU C compiler? # Is the compiler the GNU C compiler?
with_gcc=yes 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` gcc_ver=`gcc -dumpversion`
# An ERE matcher. # An ERE matcher.
EGREP="grep -E" EGREP="grep -E"
# The linker used to build libraries. # 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. # Whether we need hard or soft links.
LN_S="ln -s" LN_S="ln -s"
...@@ -174,7 +174,7 @@ dlopen_self=unknown ...@@ -174,7 +174,7 @@ dlopen_self=unknown
dlopen_self_static=unknown dlopen_self_static=unknown
# Compiler flag to prevent dynamic linking. # Compiler flag to prevent dynamic linking.
link_static_flag="" link_static_flag="-static"
# Compiler flag to turn off builtin functions. # Compiler flag to turn off builtin functions.
no_builtin_flag=" -fno-builtin" no_builtin_flag=" -fno-builtin"
...@@ -328,10 +328,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM ...@@ -328,10 +328,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown link_all_deplibs=unknown
# Compile-time system search path for libraries # 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 # Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /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/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 " 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 the shell variable $srcfile for the compiler.
fix_srcfile_path="" fix_srcfile_path=""
...@@ -7266,7 +7266,7 @@ disable_libs=static ...@@ -7266,7 +7266,7 @@ disable_libs=static
# End: # End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX # ### BEGIN LIBTOOL TAG CONFIG: CXX
# Libtool was configured on host p2s103: # Libtool was configured on host NWRW15:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
...@@ -7288,12 +7288,12 @@ fast_install=yes ...@@ -7288,12 +7288,12 @@ fast_install=yes
# The host system. # The host system.
host_alias= host_alias=
host=x86_64-unknown-linux-gnu host=i686-redhat-linux-gnu
host_os=linux-gnu host_os=linux-gnu
# The build system. # The build system.
build_alias= build_alias=
build=x86_64-unknown-linux-gnu build=i686-redhat-linux-gnu
build_os=linux-gnu build_os=linux-gnu
# An echo program that does not interpret backslashes. # An echo program that does not interpret backslashes.
...@@ -7304,25 +7304,25 @@ AR="ar" ...@@ -7304,25 +7304,25 @@ AR="ar"
AR_FLAGS="cru" AR_FLAGS="cru"
# A C compiler. # A C compiler.
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc" LTCC="gcc"
# LTCC compiler flags. # LTCC compiler flags.
LTCFLAGS="-g -O2" LTCFLAGS="-g -O2"
# A language-specific compiler. # A language-specific compiler.
CC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC" CC="g++"
# Is the compiler the GNU C compiler? # Is the compiler the GNU C compiler?
with_gcc=yes 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` gcc_ver=`gcc -dumpversion`
# An ERE matcher. # An ERE matcher.
EGREP="grep -E" EGREP="grep -E"
# The linker used to build libraries. # 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. # Whether we need hard or soft links.
LN_S="ln -s" LN_S="ln -s"
...@@ -7396,7 +7396,7 @@ dlopen_self=unknown ...@@ -7396,7 +7396,7 @@ dlopen_self=unknown
dlopen_self_static=unknown dlopen_self_static=unknown
# Compiler flag to prevent dynamic linking. # Compiler flag to prevent dynamic linking.
link_static_flag="" link_static_flag="-static"
# Compiler flag to turn off builtin functions. # Compiler flag to turn off builtin functions.
no_builtin_flag=" -fno-builtin" no_builtin_flag=" -fno-builtin"
...@@ -7451,11 +7451,11 @@ striplib="strip --strip-unneeded" ...@@ -7451,11 +7451,11 @@ striplib="strip --strip-unneeded"
# Dependencies to place before the objects being linked to create a # Dependencies to place before the objects being linked to create a
# shared library. # shared library.
predep_objects=`echo "/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" | $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 # Dependencies to place after the objects being linked to create a
# shared library. # shared library.
postdep_objects=`echo "/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" | $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 # Dependencies to place before the objects being linked to create a
# shared library. # shared library.
...@@ -7463,11 +7463,11 @@ predeps="" ...@@ -7463,11 +7463,11 @@ predeps=""
# Dependencies to place after the objects being linked to create a # Dependencies to place after the objects being linked to create a
# shared library. # 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 # The library search path used internally by the compiler when linking
# a shared library. # a shared library.
compiler_lib_search_path=`echo "-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/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. # Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all" deplibs_check_method="pass_all"
...@@ -7547,10 +7547,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM ...@@ -7547,10 +7547,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown link_all_deplibs=unknown
# Compile-time system search path for libraries # 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 # Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /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/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 " 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 the shell variable $srcfile for the compiler.
fix_srcfile_path="" fix_srcfile_path=""
...@@ -7574,7 +7574,7 @@ include_expsyms="" ...@@ -7574,7 +7574,7 @@ include_expsyms=""
# ### BEGIN LIBTOOL TAG CONFIG: F77 # ### BEGIN LIBTOOL TAG CONFIG: F77
# Libtool was configured on host p2s103: # Libtool was configured on host NWRW15:
# Shell to use when invoking shell scripts. # Shell to use when invoking shell scripts.
SHELL="/bin/sh" SHELL="/bin/sh"
...@@ -7596,12 +7596,12 @@ fast_install=yes ...@@ -7596,12 +7596,12 @@ fast_install=yes
# The host system. # The host system.
host_alias= host_alias=
host=x86_64-unknown-linux-gnu host=i686-redhat-linux-gnu
host_os=linux-gnu host_os=linux-gnu
# The build system. # The build system.
build_alias= build_alias=
build=x86_64-unknown-linux-gnu build=i686-redhat-linux-gnu
build_os=linux-gnu build_os=linux-gnu
# An echo program that does not interpret backslashes. # An echo program that does not interpret backslashes.
...@@ -7612,7 +7612,7 @@ AR="ar" ...@@ -7612,7 +7612,7 @@ AR="ar"
AR_FLAGS="cru" AR_FLAGS="cru"
# A C compiler. # A C compiler.
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc" LTCC="gcc"
# LTCC compiler flags. # LTCC compiler flags.
LTCFLAGS="-g -O2" LTCFLAGS="-g -O2"
...@@ -7621,16 +7621,16 @@ LTCFLAGS="-g -O2" ...@@ -7621,16 +7621,16 @@ LTCFLAGS="-g -O2"
CC="g77" CC="g77"
# Is the compiler the GNU C compiler? # 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` gcc_ver=`gcc -dumpversion`
# An ERE matcher. # An ERE matcher.
EGREP="grep -E" EGREP="grep -E"
# The linker used to build libraries. # 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. # Whether we need hard or soft links.
LN_S="ln -s" LN_S="ln -s"
...@@ -7858,10 +7858,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM ...@@ -7858,10 +7858,10 @@ variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COM
link_all_deplibs=unknown link_all_deplibs=unknown
# Compile-time system search path for libraries # 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 # Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /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/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 " 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 the shell variable $srcfile for the compiler.
fix_srcfile_path="" fix_srcfile_path=""
......
AMDiS/src/AdaptBase.h
View file @ 6c978c46
...@@ -43,14 +43,14 @@ namespace AMDiS { ...@@ -43,14 +43,14 @@ namespace AMDiS {
/** \brief /** \brief
* Constructor * Constructor
*/ */
AdaptBase(const ::std::string& name, AdaptBase(const ::std::string& name,
ProblemIterationInterface *problemIteration, ProblemIterationInterface *problemIteration,
AdaptInfo *adaptInfo_, AdaptInfo *adaptInfo,
ProblemTimeInterface *problemTime = NULL, ProblemTimeInterface *problemTime = NULL,
AdaptInfo *initialAdaptInfo = NULL) AdaptInfo *initialAdaptInfo = NULL)
: name_(name), : name_(name),
problemIteration_(problemIteration), problemIteration_(problemIteration),
adaptInfo(adaptInfo_), adaptInfo_(adaptInfo),
problemTime_(problemTime), problemTime_(problemTime),
initialAdaptInfo_(initialAdaptInfo) initialAdaptInfo_(initialAdaptInfo)
{}; {};
...@@ -85,10 +85,10 @@ namespace AMDiS { ...@@ -85,10 +85,10 @@ namespace AMDiS {
}; };
/** \brief /** \brief
* Returns \ref adaptInfo * Returns \ref adaptInfo_
*/ */
inline AdaptInfo *getAdaptInfo() { inline AdaptInfo *getAdaptInfo() {
return adaptInfo; return adaptInfo_;
}; };
/** \brief /** \brief
...@@ -123,7 +123,7 @@ namespace AMDiS { ...@@ -123,7 +123,7 @@ namespace AMDiS {
/** \brief /** \brief
* Main adapt info * Main adapt info
*/ */
AdaptInfo *adaptInfo; AdaptInfo *adaptInfo_;
/** \brief /** \brief
* problem time interface * problem time interface
......
AMDiS/src/AdaptInstationary.cc
View file @ 6c978c46
...@@ -77,24 +77,24 @@ namespace AMDiS { ...@@ -77,24 +77,24 @@ namespace AMDiS {
FUNCNAME("AdaptInstationary::explicitTimeStrategy()"); FUNCNAME("AdaptInstationary::explicitTimeStrategy()");
// estimate before first adaption // estimate before first adaption
if (adaptInfo->getTime() <= adaptInfo->getStartTime()) { if (adaptInfo_->getTime() <= adaptInfo_->getStartTime()) {
problemIteration_->oneIteration(adaptInfo, ESTIMATE); problemIteration_->oneIteration(adaptInfo_, ESTIMATE);
} }
// increment time // increment time
adaptInfo->setTime(adaptInfo->getTime() + adaptInfo->getTimestep()); adaptInfo_->setTime(adaptInfo_->getTime() + adaptInfo_->getTimestep());
problemTime_->setTime(adaptInfo); problemTime_->setTime(adaptInfo_);
INFO(info_,6)("time = %e, timestep = %e\n", INFO(info_,6)("time = %e, timestep = %e\n",
adaptInfo->getTime(), adaptInfo->getTimestep()); adaptInfo_->getTime(), adaptInfo_->getTimestep());
adaptInfo->setSpaceIteration(0); adaptInfo_->setSpaceIteration(0);
// do the iteration // do the iteration
problemIteration_->beginIteration(adaptInfo); problemIteration_->beginIteration(adaptInfo_);
problemIteration_->oneIteration(adaptInfo, FULL_ITERATION); problemIteration_->oneIteration(adaptInfo_, FULL_ITERATION);
problemIteration_->endIteration(adaptInfo); problemIteration_->endIteration(adaptInfo_);
} }
void AdaptInstationary::implicitTimeStrategy() void AdaptInstationary::implicitTimeStrategy()
...@@ -102,54 +102,54 @@ namespace AMDiS { ...@@ -102,54 +102,54 @@ namespace AMDiS {
FUNCNAME("AdaptInstationary::implicitTimeStrategy()"); FUNCNAME("AdaptInstationary::implicitTimeStrategy()");
do { do {
adaptInfo->setTime(adaptInfo->getTime() + adaptInfo->getTimestep()); adaptInfo_->setTime(adaptInfo_->getTime() + adaptInfo_->getTimestep());
problemTime_->setTime(adaptInfo); problemTime_->setTime(adaptInfo_);
INFO(info_,6)("time = %e, try timestep = %e\n", INFO(info_,6)("time = %e, try timestep = %e\n",
adaptInfo->getTime(), adaptInfo->getTimestep()); adaptInfo_->getTime(), adaptInfo_->getTimestep());
problemIteration_->oneIteration(adaptInfo, NO_ADAPTION); problemIteration_->oneIteration(adaptInfo_, NO_ADAPTION);
adaptInfo->incTimestepIteration(); adaptInfo_->incTimestepIteration();
if (!fixedTimestep_ && if (!fixedTimestep_ &&
!adaptInfo->timeToleranceReached() && !adaptInfo_->timeToleranceReached() &&
!adaptInfo->getTimestep() <= adaptInfo->getMinTimestep()) !adaptInfo_->getTimestep() <= adaptInfo_->getMinTimestep())
{ {
adaptInfo->setTime(adaptInfo->getTime() - adaptInfo->getTimestep()); adaptInfo_->setTime(adaptInfo_->getTime() - adaptInfo_->getTimestep());
adaptInfo->setTimestep(adaptInfo->getTimestep() * time_delta_1); adaptInfo_->setTimestep(adaptInfo_->getTimestep() * time_delta_1);
continue; continue;
} }
adaptInfo->setSpaceIteration(0); adaptInfo_->setSpaceIteration(0);
do { do {
problemIteration_->beginIteration(adaptInfo); problemIteration_->beginIteration(adaptInfo_);
if (problemIteration_->oneIteration(adaptInfo, FULL_ITERATION)) { if (problemIteration_->oneIteration(adaptInfo_, FULL_ITERATION)) {
if (!fixedTimestep_ && if (!fixedTimestep_ &&
!adaptInfo->timeToleranceReached() && !adaptInfo_->timeToleranceReached() &&
!adaptInfo->getTimestep() <= adaptInfo->getMinTimestep()) !adaptInfo_->getTimestep() <= adaptInfo_->getMinTimestep())
{ {
adaptInfo->setTime(adaptInfo->getTime() - adaptInfo->getTimestep()); adaptInfo_->setTime(adaptInfo_->getTime() - adaptInfo_->getTimestep());
adaptInfo->setTimestep(adaptInfo->getTimestep() * time_delta_1); adaptInfo_->setTimestep(adaptInfo_->getTimestep() * time_delta_1);
problemIteration_->endIteration(adaptInfo); problemIteration_->endIteration(adaptInfo_);
adaptInfo->incSpaceIteration(); adaptInfo_->incSpaceIteration();
break; break;
} }
} }
adaptInfo->incSpaceIteration(); adaptInfo_->incSpaceIteration();
problemIteration_->endIteration(adaptInfo); problemIteration_->endIteration(adaptInfo_);
} while(!adaptInfo->spaceToleranceReached() && } while(!adaptInfo_->spaceToleranceReached() &&
adaptInfo->getSpaceIteration() <= adaptInfo->getMaxSpaceIteration()); adaptInfo_->getSpaceIteration() <= adaptInfo_->getMaxSpaceIteration());
} while(!adaptInfo->timeToleranceReached() && } while(!adaptInfo_->timeToleranceReached() &&
!adaptInfo->getTimestep() <= adaptInfo->getMinTimestep() && !adaptInfo_->getTimestep() <= adaptInfo_->getMinTimestep() &&
adaptInfo->getTimestepIteration() <= adaptInfo->getMaxTimestepIteration()); adaptInfo_->getTimestepIteration() <= adaptInfo_->getMaxTimestepIteration());
if (!fixedTimestep_ && adaptInfo->timeErrorLow()) { if (!fixedTimestep_ && adaptInfo_->timeErrorLow()) {
adaptInfo->setTimestep(adaptInfo->getTimestep() *time_delta_2); adaptInfo_->setTimestep(adaptInfo_->getTimestep() *time_delta_2);
} }
} }
...@@ -157,7 +157,7 @@ namespace AMDiS { ...@@ -157,7 +157,7 @@ namespace AMDiS {
{ {
FUNCNAME("AdaptInstationary::oneTimestep"); FUNCNAME("AdaptInstationary::oneTimestep");
adaptInfo->setTimestepIteration(0); adaptInfo_->setTimestepIteration(0);
switch(strategy) switch(strategy)
{ {
...@@ -172,7 +172,7 @@ namespace AMDiS { ...@@ -172,7 +172,7 @@ namespace AMDiS {
explicitTimeStrategy(); explicitTimeStrategy();
} }
adaptInfo->incTimestepNumber(); adaptInfo_->incTimestepNumber();
} }
int AdaptInstationary::adapt() int AdaptInstationary::adapt()
...@@ -181,30 +181,29 @@ namespace AMDiS { ...@@ -181,30 +181,29 @@ namespace AMDiS {
int errorCode = 0; int errorCode = 0;
TEST_EXIT(adaptInfo->getTimestep() >= adaptInfo->getMinTimestep()) TEST_EXIT(adaptInfo_->getTimestep() >= adaptInfo_->getMinTimestep())
("timestep < min timestep\n"); ("timestep < min timestep\n");
TEST_EXIT(adaptInfo->getTimestep() <= adaptInfo->getMaxTimestep()) TEST_EXIT(adaptInfo_->getTimestep() <= adaptInfo_->getMaxTimestep())
("timestep > max timestep\n"); ("timestep > max timestep\n");
TEST_EXIT(adaptInfo->getTimestep() > 0)("timestep <= 0!\n"); TEST_EXIT(adaptInfo_->getTimestep() > 0)("timestep <= 0!\n");
if (adaptInfo->getTimestepNumber() == 0) {