Commit c03d1a79 authored by Thomas Witkowski's avatar Thomas Witkowski

work on parallel domain decomposition.

parent 52fe8d57
......@@ -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="/bin/sed"
SED="/usr/bin/sed"
# Sed that helps us avoid accidentally triggering echo(1) options like -n.
Xsed="/bin/sed -e 1s/^X//"
Xsed="/usr/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 NWRW15:
# Libtool was configured on host p2d069:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
......@@ -66,12 +66,12 @@ fast_install=yes
# The host system.
host_alias=
host=i686-pc-linux-gnu
host=x86_64-unknown-linux-gnu
host_os=linux-gnu
# The build system.
build_alias=
build=i686-pc-linux-gnu
build=x86_64-unknown-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="gcc"
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# LTCC compiler flags.
LTCFLAGS="-g -O2"
# A language-specific compiler.
CC="gcc"
CC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# 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/bin/ld"
LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
# 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="-static"
link_static_flag=""
# 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/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/"
sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-suse-linux/4.1.2/ /usr/lib/gcc/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/ /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/"
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib "
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.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 "
# 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 NWRW15:
# Libtool was configured on host p2d069:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
......@@ -6782,12 +6782,12 @@ fast_install=yes
# The host system.
host_alias=
host=i686-pc-linux-gnu
host=x86_64-unknown-linux-gnu
host_os=linux-gnu
# The build system.
build_alias=
build=i686-pc-linux-gnu
build=x86_64-unknown-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="gcc"
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# LTCC compiler flags.
LTCFLAGS="-g -O2"
# A language-specific compiler.
CC="g++"
CC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpiCC"
# 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/bin/ld"
LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
# 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="-static"
link_static_flag=""
# 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/gcc/i386-redhat-linux/4.1.2/../../../crti.o /usr/lib/gcc/i386-redhat-linux/4.1.2/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"
# Dependencies to place after the objects being linked to create a
# shared library.
postdep_objects="/usr/lib/gcc/i386-redhat-linux/4.1.2/crtendS.o /usr/lib/gcc/i386-redhat-linux/4.1.2/../../../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"
# 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="-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/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/../../.."
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/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"
......@@ -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/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/"
sys_lib_search_path_spec=" /usr/lib64/gcc/x86_64-suse-linux/4.1.2/ /usr/lib/gcc/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../x86_64-suse-linux/lib/../lib64/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../x86_64-suse-linux/4.1.2/ /usr/lib64/gcc/x86_64-suse-linux/4.1.2/../../../../lib64/ /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/"
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib "
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.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 "
# 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 NWRW15:
# Libtool was configured on host p2d069:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
......@@ -7087,12 +7087,12 @@ fast_install=yes
# The host system.
host_alias=
host=i686-pc-linux-gnu
host=x86_64-unknown-linux-gnu
host_os=linux-gnu
# The build system.
build_alias=
build=i686-pc-linux-gnu
build=x86_64-unknown-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="gcc"
LTCC="/licsoft/libraries/openmpi/1.2.6/64bit/bin/mpicc"
# LTCC compiler flags.
LTCFLAGS="-g -O2"
......@@ -7112,13 +7112,13 @@ LTCFLAGS="-g -O2"
CC="g77"
# Is the compiler the GNU C compiler?
with_gcc=yes
with_gcc=
# An ERE matcher.
EGREP="grep -E"
# The linker used to build libraries.
LD="/usr/bin/ld"
LD="/usr/x86_64-suse-linux/bin/ld -m elf_x86_64"
# 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/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/"
sys_lib_search_path_spec=" /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/ /usr/lib/gcc/x86_64-suse-linux/3.3.5/ /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/../../../../x86_64-suse-linux/lib/x86_64-suse-linux/3.3.5/ /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/../../../../x86_64-suse-linux/lib/ /usr/lib64/gcc-lib/x86_64-suse-linux/3.3.5/../../../x86_64-suse-linux/3.3.5/ /usr/lib64/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/"
# Run-time system search path for libraries
sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/octave-2.9.9 /usr/lib/qt-3.3/lib "
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.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 "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
......
......@@ -54,37 +54,44 @@ namespace AMDiS {
virtual int adapt() = 0;
/// Returns \ref name
inline const std::string& getName() const {
inline const std::string& getName() const
{
return name;
}
/// Returns \ref problemIteration_
inline ProblemIterationInterface *getProblemIteration() {
inline ProblemIterationInterface *getProblemIteration()
{
return problemIteration_;
}
///
inline void setProblemIteration(ProblemIterationInterface *pii) {
inline void setProblemIteration(ProblemIterationInterface *pii)
{
problemIteration_ = pii;
}
/// Returns \ref adaptInfo
inline AdaptInfo *getAdaptInfo() {
inline AdaptInfo *getAdaptInfo()
{
return adaptInfo;
}
/// Returns \ref problemTime_
inline ProblemTimeInterface *getProblemTime() {
inline ProblemTimeInterface *getProblemTime()
{
return problemTime_;
}
///
inline void setProblemTime(ProblemTimeInterface *pti) {
inline void setProblemTime(ProblemTimeInterface *pti)
{
problemTime_ = pti;
}
/// Returns \ref initialAdaptInfo_
inline AdaptInfo *getInitialAdaptInfo() {
inline AdaptInfo *getInitialAdaptInfo()
{
return initialAdaptInfo_;
}
......
......@@ -191,7 +191,8 @@ namespace AMDiS {
}
/// Returns whether space tolerance is reached.
virtual bool spaceToleranceReached() {
virtual bool spaceToleranceReached()
{
int size = scalContents.getSize();
for (int i = 0; i < size; i++)
if (!(scalContents[i]->est_sum < scalContents[i]->spaceTolerance))
......@@ -201,7 +202,8 @@ namespace AMDiS {
}
/// Returns whether space tolerance of component i is reached.
virtual bool spaceToleranceReached(int i) {
virtual bool spaceToleranceReached(int i)
{
if (!(scalContents[i]->est_sum < scalContents[i]->spaceTolerance))
return false;
else
......@@ -209,7 +211,8 @@ namespace AMDiS {
}
/// Returns whether time tolerance is reached.
virtual bool timeToleranceReached() {
virtual bool timeToleranceReached()
{
int size = scalContents.getSize();
for (int i = 0; i < size; i++)
if (!(scalContents[i]->est_t_sum < scalContents[i]->timeTolerance))
......@@ -219,7 +222,8 @@ namespace AMDiS {
}
/// Returns whether time tolerance of component i is reached.
virtual bool timeToleranceReached(int i) {
virtual bool timeToleranceReached(int i)
{
if (!(scalContents[i]->est_t_sum < scalContents[i]->timeTolerance))
return false;
else
......@@ -227,7 +231,8 @@ namespace AMDiS {
}
/// Returns whether time error is under its lower bound.
virtual bool timeErrorLow() {
virtual bool timeErrorLow()
{
int size = scalContents.getSize();
for (int i = 0; i < size; i++)
if (!(scalContents[i]->est_t_sum < scalContents[i]->timeErrLow))
......@@ -237,164 +242,196 @@ namespace AMDiS {
}
/// Print debug information about time error and its bound.
void printTimeErrorLowInfo() {
void printTimeErrorLowInfo()
{
for (int i = 0; i < scalContents.getSize(); i++)
std::cout << " Time error estimate = " << scalContents[i]->est_t_sum
<< " Time error bound = " << scalContents[i]->timeErrLow << "\n";
}
/// Returns \ref spaceIteration.
inline int getSpaceIteration() {
inline int getSpaceIteration()
{
return spaceIteration;
}
/// Sets \ref spaceIteration.
inline void setSpaceIteration(int it) {
inline void setSpaceIteration(int it)
{
spaceIteration = it;
}
/// Returns \ref maxSpaceIteration.
inline int getMaxSpaceIteration() {
inline int getMaxSpaceIteration()
{
return maxSpaceIteration;
}
/// Sets \ref maxSpaceIteration.
inline void setMaxSpaceIteration(int it) {
inline void setMaxSpaceIteration(int it)
{
maxSpaceIteration = it;
}
/// Increments \ref spaceIteration by 1;
inline void incSpaceIteration() {
inline void incSpaceIteration()
{
spaceIteration++;
}
/// Sets \ref timestepIteration.
inline void setTimestepIteration(int it) {
inline void setTimestepIteration(int it)
{
timestepIteration = it;
}
/// Returns \ref timestepIteration.
inline int getTimestepIteration() {
inline int getTimestepIteration()
{
return timestepIteration;
}
/// Increments \ref timestepIteration by 1;
inline void incTimestepIteration() {
inline void incTimestepIteration()
{
timestepIteration++;
}
/// Returns \ref maxTimestepIteration.
inline int getMaxTimestepIteration() {
inline int getMaxTimestepIteration()
{
return maxTimestepIteration;
}
/// Sets \ref maxTimestepIteration.
inline void setMaxTimestepIteration(int it) {
inline void setMaxTimestepIteration(int it)
{
maxTimestepIteration = it;
}
/// Sets \ref timeIteration.
inline void setTimeIteration(int it) {
inline void setTimeIteration(int it)
{
timeIteration = it;
}
/// Returns \ref timeIteration.
inline int getTimeIteration() {
inline int getTimeIteration()
{
return timeIteration;
}
/// Increments \ref timesIteration by 1;
inline void incTimeIteration() {
inline void incTimeIteration()
{
timeIteration++;
}
/// Returns \ref maxTimeIteration.
inline int getMaxTimeIteration() {
inline int getMaxTimeIteration()
{
return maxTimeIteration;
}
/// Sets \ref maxTimeIteration.
inline void setMaxTimeIteration(int it) {
inline void setMaxTimeIteration(int it)
{
maxTimeIteration = it;
}
/// Returns \ref timestepNumber.
inline int getTimestepNumber() {
inline int getTimestepNumber()
{
return timestepNumber;
}
/// Returns \ref nTimesteps.
inline int getNumberOfTimesteps() {
inline int getNumberOfTimesteps()
{
return nTimesteps;
}
/// Increments \ref timestepNumber by 1;
inline void incTimestepNumber() {
inline void incTimestepNumber()
{
timestepNumber++;
}
/// Sets \ref est_sum.
inline void setEstSum(double e, int index) {
inline void setEstSum(double e, int index)
{
scalContents[index]->est_sum = e;
}
/// Sets \ref est_max.
inline void setEstMax(double e, int index) {
inline void setEstMax(double e, int index)
{
scalContents[index]->est_max = e;
}
/// Sets \ref est_max.
inline void setTimeEstMax(double e, int index) {
inline void setTimeEstMax(double e, int index)
{
scalContents[index]->est_t_max = e;
}
/// Sets \ref est_t_sum.
inline void setTimeEstSum(double e, int index) {
inline void setTimeEstSum(double e, int index)
{
scalContents[index]->est_t_sum = e;
}
/// Returns \ref est_sum.
inline double getEstSum(int index) {
inline double getEstSum(int index)
{
return scalContents[index]->est_sum;
}
/// Returns \ref est_t_sum.
inline double getEstTSum(int index) {
inline double getEstTSum(int index)
{
return scalContents[index]->est_t_sum;
}
/// Returns \ref est_max.
inline double getEstMax(int index) {
inline double getEstMax(int index)
{
return scalContents[index]->est_max;
}
/// Returns \ref est_max.
inline double getTimeEstMax(int index) {
inline double getTimeEstMax(int index)
{
return scalContents[index]->est_t_max;
}
/// Returns \ref est_t_sum.
inline double getTimeEstSum(int index) {
inline double getTimeEstSum(int index)
{
return scalContents[index]->est_t_sum;
}
/// Returns \ref spaceTolerance.
inline double getSpaceTolerance(int index) {
inline double getSpaceTolerance(int index)
{
return scalContents[index]->spaceTolerance;
}
/// Sets \ref spaceTolerance.
inline void setSpaceTolerance(int index, double tol) {
inline void setSpaceTolerance(int index, double tol)
{
scalContents[index]->spaceTolerance = tol;
}
/// Returns \ref timeTolerance.
inline double getTimeTolerance(int index) {
inline double getTimeTolerance(int index)
{
return scalContents[index]->timeTolerance;
}
/// Sets \ref time
inline double setTime(double t) {
inline double setTime(double t)
{
time = t;
if (time > endTime)
time = endTime;
......@@ -405,27 +442,27 @@ namespace AMDiS {
}
/// Gets \ref time
inline double getTime() {
inline double getTime()
{
return time;
}
/// Gets \ref &time
inline double *getTimePtr() {
inline double *getTimePtr()
{
return &time;
}
/// Sets \ref timestep
inline double setTimestep(double t) {
inline double setTimestep(double t)
{
timestep = t;
if (timestep > maxTimestep) {
if (timestep > maxTimestep)
timestep = maxTimestep;
}
if (timestep < minTimestep) {
if (timestep < minTimestep)
timestep = minTimestep;
}
if (time + timestep > endTime) {
if (time + timestep > endTime)
timestep = endTime - time;
}
return timestep;
}
......@@ -434,7 +471,8 @@ namespace AMDiS {
* Returns true, if the end time is reached and no more timestep
* computations must be done.
*/
inline bool reachedEndTime() {
inline bool reachedEndTime()
{
if (nTimesteps > 0)
return !(timestepNumber < nTimesteps);
......@@ -442,132 +480,160 @@ namespace AMDiS {
}
/// Gets \ref timestep
inline double getTimestep() {
inline double getTimestep()
{
return timestep;
}
/// Sets \ref minTimestep
inline void setMinTimestep(double t) {
inline void setMinTimestep(double t)
{
minTimestep = t;
}
/// Gets \ref minTimestep
inline double getMinTimestep() {
inline double getMinTimestep()
{
return minTimestep;
}
/// Sets \ref maxTimestep
inline void setMaxTimestep(double t) {
inline void setMaxTimestep(double t)
{
maxTimestep = t;
}
/// Gets \ref maxTimestep
inline double getMaxTimestep() {
inline double getMaxTimestep()
{
return maxTimestep;
}
/// Gets \ref &timestep
inline double *getTimestepPtr() {
inline double *getTimestepPtr()
{
return &timestep;
}
/// Sets \ref startTime = time
inline void setStartTime(double time) {
inline void setStartTime(double time)
{
startTime = time;
}
/// Sets \ref endTime = time
inline void setEndTime(double time) {
inline void setEndTime(double time)
{
endTime = time;