Commit e0d865ce authored by Backofen, Rainer's avatar Backofen, Rainer
Browse files

always accept timestep in Rosenbrock-method if timestep is minimal timestep....

always accept timestep in Rosenbrock-method if timestep is minimal timestep. There is a warning if tolerance is not reached
parent ff9e3a6c
...@@ -51,32 +51,32 @@ build_old_libs=yes ...@@ -51,32 +51,32 @@ build_old_libs=yes
pic_mode=default pic_mode=default
# Whether or not to optimize for fast installation. # Whether or not to optimize for fast installation.
fast_install=needless 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
# 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="$SED -e 1s/^X//" Xsed="$SED -e 1s/^X//"
# A grep program that handles long lines. # A grep program that handles long lines.
GREP="/usr/bin/grep" GREP="/bin/grep"
# An ERE matcher. # An ERE matcher.
EGREP="/usr/bin/grep -E" EGREP="/bin/grep -E"
# A literal string matcher. # A literal string matcher.
FGREP="/usr/bin/grep -F" FGREP="/bin/grep -F"
# A BSD- or MS-compatible name lister. # A BSD- or MS-compatible name lister.
NM="/usr/bin/nm -B" NM="/usr/bin/nm -B"
...@@ -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=1572864 max_cmd_len=98304
# Object file suffix (normally "o"). # Object file suffix (normally "o").
objext=o objext=o
...@@ -204,7 +204,7 @@ runpath_var=LD_RUN_PATH ...@@ -204,7 +204,7 @@ runpath_var=LD_RUN_PATH
shlibpath_var=LD_LIBRARY_PATH shlibpath_var=LD_LIBRARY_PATH
# Is shlibpath searched before the hard-coded library search path? # Is shlibpath searched before the hard-coded library search path?
shlibpath_overrides_runpath=yes shlibpath_overrides_runpath=no
# Format of library name prefix. # Format of library name prefix.
libname_spec="lib\$name" libname_spec="lib\$name"
...@@ -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="/u/backofen/adds/local/lib /usr/lib/gcc/i386-redhat-linux/4.1.2 /usr/lib /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/lib/mysql /usr/lib/octave-3.0.1 /usr/lib/qt-3.3/lib /usr/lib/qt4/lib /usr/lib/xulrunner-1.9.2 "
# Whether dlopen is supported. # Whether dlopen is supported.
dlopen_support=unknown dlopen_support=unknown
...@@ -253,7 +253,7 @@ striplib="strip --strip-unneeded" ...@@ -253,7 +253,7 @@ striplib="strip --strip-unneeded"
# 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"
# Commands used to build an old-style archive. # Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib" old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
...@@ -8908,7 +8908,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac` ...@@ -8908,7 +8908,7 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### BEGIN LIBTOOL TAG CONFIG: CXX # ### BEGIN LIBTOOL TAG CONFIG: CXX
# 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"
# Commands used to build an old-style archive. # Commands used to build an old-style archive.
old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib" old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib"
...@@ -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/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="/u/backofen/adds/local/lib /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/../../.."
# 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/lib/gcc/i386-redhat-linux/4.1.2/../../../crti.o /usr/lib/gcc/i386-redhat-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/lib/gcc/i386-redhat-linux/4.1.2/crtendS.o /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../crtn.o"
predeps="" predeps=""
postdeps="-lstdc++ -lm -lgcc_s -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/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/u/backofen/adds/local/lib -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/../../.."
# ### END LIBTOOL TAG CONFIG: CXX # ### END LIBTOOL TAG CONFIG: CXX
...@@ -723,9 +723,8 @@ namespace AMDiS { ...@@ -723,9 +723,8 @@ namespace AMDiS {
result = read_indices(file, *ind); result = read_indices(file, *ind);
TEST_EXIT(result) TEST_EXIT(result)
("cannot read boundary projector of element %d in file %s\n", i, filename.c_str()); ("cannot read boundary projector of element %d in file %s\n", i, filename.c_str());
Projection *projector = Projection::getProjection((*ind)[0]); Projection *projector = Projection::getProjection((*ind)[0]);
if (projector && projector->getType() == VOLUME_PROJECTION) { if (projector && projector->getType() == VOLUME_PROJECTION) {
mel[i]->setProjection(0, projector); mel[i]->setProjection(0, projector);
} else { // boundary projection } else { // boundary projection
......
...@@ -114,7 +114,8 @@ namespace AMDiS { ...@@ -114,7 +114,8 @@ namespace AMDiS {
} }
if (errorEst < timeTol || fixFirstTimesteps) { if (errorEst < timeTol || fixFirstTimesteps
|| !(adaptInfo->getTimestep()>adaptInfo->getMinTimestep()) ) {
INFO(info, 6)("Accepted timestep at time = %e with timestep = %e\n", INFO(info, 6)("Accepted timestep at time = %e with timestep = %e\n",
adaptInfo->getTime() - adaptInfo->getTimestep(), adaptInfo->getTime() - adaptInfo->getTimestep(),
adaptInfo->getTimestep()); adaptInfo->getTimestep());
...@@ -126,6 +127,10 @@ namespace AMDiS { ...@@ -126,6 +127,10 @@ namespace AMDiS {
for (int i = 0; i < adaptInfo->getSize(); i++) for (int i = 0; i < adaptInfo->getSize(); i++)
INFO(info, 6)("time estimate for component %d = %e\n", INFO(info, 6)("time estimate for component %d = %e\n",
i, adaptInfo->getTimeEstSum(i)); i, adaptInfo->getTimeEstSum(i));
if(errorEst > timeTol)
WARNING("Accepted timestep but tolerance not reached \n" );
} else { } else {
for (int i = 0; i < adaptInfo->getSize(); i++) for (int i = 0; i < adaptInfo->getSize(); i++)
INFO(info, 6)("time estimate for component %d = %e\n", INFO(info, 6)("time estimate for component %d = %e\n",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment