Größter Merge in der Geschichte von AMDiS. Mit Thomas' Beteiligung.

d2cd8700 · Peter Gottschling · 37ff8894 · d2cd8700 · d2cd8700 · d2cd8700
Commit d2cd8700 authored Apr 28, 2009 by Peter Gottschling
75 changed files
--- a/AMDiS/Makefile.in
+++ b/AMDiS/Makefile.in
@@ -139,6 +139,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 RANLIB = @RANLIB@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@

--- a/AMDiS/aclocal.m4
+++ b/AMDiS/aclocal.m4
@@ -1578,10 +1578,27 @@ linux*)
  # before this can be enabled.
  hardcode_into_libs=yes

+  # find out which ABI we are using
+  libsuff=
+  case "$host_cpu" in
+  x86_64*|s390x*|powerpc64*)
+    echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+    if AC_TRY_EVAL(ac_compile); then
+      case `/usr/bin/file conftest.$ac_objext` in
+      *64-bit*)
+        libsuff=64
+        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+        ;;
+      esac
+    fi
+    rm -rf conftest*
+    ;;
+  esac
+
  # Append ld.so.conf contents to the search path
  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"
  fi

  # We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -4288,6 +4305,9 @@ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
 # Is the compiler the GNU C compiler?
 with_gcc=$_LT_AC_TAGVAR(GCC, $1)

+gcc_dir=\`gcc -print-file-name=. | $SED 's,/\.$,,'\`
+gcc_ver=\`gcc -dumpversion\`
+
 # An ERE matcher.
 EGREP=$lt_EGREP

@@ -4421,11 +4441,11 @@ striplib=$lt_striplib

 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
+predep_objects=\`echo $lt_[]_LT_AC_TAGVAR(predep_objects, $1) | \$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
 # shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
+postdep_objects=\`echo $lt_[]_LT_AC_TAGVAR(postdep_objects, $1) | \$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
 # shared library.
@@ -4437,7 +4457,7 @@ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)

 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+compiler_lib_search_path=\`echo $lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
@@ -4517,7 +4537,7 @@ variables_saved_for_relink="$variables_saved_for_relink"
 link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)

 # Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+sys_lib_search_path_spec=\`echo $lt_sys_lib_search_path_spec | \$SED -e "s@\${gcc_dir}@\\\${gcc_dir}@g;s@\${gcc_ver}@\\\${gcc_ver}@g"\`

 # Run-time system search path for libraries
 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
@@ -6353,6 +6373,7 @@ do
    done
  done
 done
+IFS=$as_save_IFS
 lt_ac_max=0
 lt_ac_count=0
 # Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -6385,6 +6406,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
 done
 ])
 SED=$lt_cv_path_SED
+AC_SUBST([SED])
 AC_MSG_RESULT([$SED])
 ])


--- a/AMDiS/autogen.sh
+++ b/AMDiS/autogen.sh
+#!/bin/sh
+
+echo "--> Running aclocal"
+aclocal
+if test "$?" != "0" ; then
+    echo "*** aclocal failed"
+    exit 1
+fi
+
+if test "`grep AC_CONFIG_HEADER configure.ac`" != "" -o \
+        "`grep AM_CONFIG_HEADER configure.ac`" != "" ; then
+    # if we use CONFIG_HEADER, then make sure to run autoheader
+    echo "--> Running autoheader"
+    autoheader
+    if test "$?" != "0" ; then
+        echo "*** autoheader failed"
+        exit 1
+    fi
+else
+    echo "--> autoheader not needed"
+fi
+
+echo "--> Running autoconf"
+autoconf
+if test "$?" != "0" ; then
+    echo "*** autoconf failed"
+    exit 1
+fi
+
+echo "--> Running libtoolize"
+libtoolize --automake --copy
+if test "$?" != "0" ; then
+    echo "*** libtoolize failed"
+    exit 1
+fi
+
+echo "--> Running automake"
+automake -a --copy --include-deps
+if test "$?" != "0" ; then
+    echo "*** automake failed"
+    exit 1
+fi
+
+echo;
+echo "Running ./configure $@"
+echo;
+./configure $@
--- a/AMDiS/bin/Makefile.am
+++ b/AMDiS/bin/Makefile.am
@@ -33,7 +33,7 @@ if USE_PARALLEL_AMDIS
 endif

 if ENABLE_UMFPACK
-  libamdis_la_CXXFLAGS += -DHAVE_UMFPACK=1
+  libamdis_la_CXXFLAGS += -DHAVE_UMFPACK=1 -DMTL_HAS_UMFPACK
  AMDIS_INCLUDES += -I$(LIB_DIR)/UFconfig \
 	            -I$(LIB_DIR)/AMD/Include \
                    -I$(LIB_DIR)/UMFPACK/Include  
@@ -52,12 +52,14 @@ if ENABLE_BOOST
  libamdis_la_CXXFLAGS += -DHAVE_BOOST=1
 endif

-INCLUDES = $(AMDIS_INCLUDES) $(PARALLEL_INCLUDES)
+TEMPLATE_INCLUDES = -I../lib/mtl4 -I../lib/boost_1_34_1
+
+INCLUDES = $(AMDIS_INCLUDES) $(PARALLEL_INCLUDES) $(TEMPLATE_INCLUDES)

 if AMDIS_DEBUG
-  libamdis_la_CXXFLAGS += -g -O0 -Wall -DDEBUG=1 $(OPENMP_FLAG) -ftemplate-depth-30 $(INCLUDES) #-pedantic
+  libamdis_la_CXXFLAGS += -g -O0 -Wall -DDEBUG=1 $(OPENMP_FLAG) $(INCLUDES) #-pedantic
 else
-  libamdis_la_CXXFLAGS += -O2 -Wall -DDEBUG=0 $(OPENMP_FLAG) -ftemplate-depth-30 $(INCLUDES) #-pedantic
+  libamdis_la_CXXFLAGS += -O2 -Wall -DDEBUG=0 -DNDEBUG $(OPENMP_FLAG) -ftemplate-depth-100 $(INCLUDES) #-pedantic
 endif


@@ -65,14 +67,10 @@ libamdis_la_SOURCES =  \
 $(PARALLEL_AMDIS_SOURCES) \
 $(SOURCE_DIR)/MultiGridPreconWrapper.h $(SOURCE_DIR)/MultiGridPreconWrapper.cc \
 $(SOURCE_DIR)/LagrangeInterpolRestrict.h \
-$(SOURCE_DIR)/BiCGStab.h $(SOURCE_DIR)/BiCGStab.hh \
-$(SOURCE_DIR)/BiCGStab2.h $(SOURCE_DIR)/BiCGStab2.hh \
 $(SOURCE_DIR)/InterpolRestrictMatrix.h $(SOURCE_DIR)/InterpolRestrictMatrix.cc \
 $(SOURCE_DIR)/DOFIndexed.h $(SOURCE_DIR)/DOFIndexed.cc \
 $(SOURCE_DIR)/GNUPlotWriter.h $(SOURCE_DIR)/GNUPlotWriter.cc \
 $(SOURCE_DIR)/SmootherBase.h \
-$(SOURCE_DIR)/StlVector.h $(SOURCE_DIR)/StlVector.cc \
-$(SOURCE_DIR)/V3Vector.h $(SOURCE_DIR)/V3Vector.cc \
 $(SOURCE_DIR)/GSSMoother.h $(SOURCE_DIR)/GSSmoother.cc \
 $(SOURCE_DIR)/JacobiSMoother.h $(SOURCE_DIR)/JacobiSmoother.cc \
 $(SOURCE_DIR)/SparseVector.h $(SOURCE_DIR)/SparseVector.hh $(SOURCE_DIR)/SparseVector.cc \
@@ -130,50 +128,22 @@ $(SOURCE_DIR)/AdaptStationary.h $(SOURCE_DIR)/AdaptStationary.cc \
 $(SOURCE_DIR)/AdaptInstationary.h $(SOURCE_DIR)/AdaptInstationary.cc \
 $(SOURCE_DIR)/QPsiPhi.h \
 $(SOURCE_DIR)/BasisFunction.h \
-$(SOURCE_DIR)/BiCGSolver.h $(SOURCE_DIR)/BiCGSolver.hh \
 $(SOURCE_DIR)/Boundary.h \
-$(SOURCE_DIR)/CGSolver.h $(SOURCE_DIR)/CGSolver.hh \
+$(SOURCE_DIR)/ITL_Solver.h \
 $(SOURCE_DIR)/CoarseningManager.h \
 $(SOURCE_DIR)/CoarseningManager1d.h $(SOURCE_DIR)/CoarseningManager2d.h $(SOURCE_DIR)/CoarseningManager3d.h \
 $(SOURCE_DIR)/demangle.h \
-$(SOURCE_DIR)/DiagonalPreconditioner.h $(SOURCE_DIR)/DiagonalPreconditioner.cc \
-$(SOURCE_DIR)/ILUPreconditioner.h $(SOURCE_DIR)/ILUPreconditioner.cc \
-$(SOURCE_DIR)/ILUTPreconditioner.h $(SOURCE_DIR)/ILUTPreconditioner.cc \
-$(SOURCE_DIR)/QN_Precond.h $(SOURCE_DIR)/QN_Precond.hh \
-$(SOURCE_DIR)/BFGS_Precond.h $(SOURCE_DIR)/BFGS_Precond.cc \
-$(SOURCE_DIR)/DOFAdmin.h \
-$(SOURCE_DIR)/DOFIterator.h \
-$(SOURCE_DIR)/DOFMatrix.h \
-$(SOURCE_DIR)/DOFVector.h $(SOURCE_DIR)/DOFVector.hh $(SOURCE_DIR)/DOFVector.cc \
-$(SOURCE_DIR)/Element.h $(SOURCE_DIR)/ElementConnection.h \
-$(SOURCE_DIR)/ElInfo.h $(SOURCE_DIR)/ElInfo1d.h $(SOURCE_DIR)/ElInfo2d.h $(SOURCE_DIR)/ElInfo3d.h \
-$(SOURCE_DIR)/Error.h $(SOURCE_DIR)/Error.hh \
-$(SOURCE_DIR)/Estimator.h $(SOURCE_DIR)/Estimator.cc \
-$(SOURCE_DIR)/ResidualEstimator.h $(SOURCE_DIR)/ResidualEstimator.cc \
-$(SOURCE_DIR)/ResidualParallelEstimator.h $(SOURCE_DIR)/ResidualParallelEstimator.cc \
-$(SOURCE_DIR)/FiniteElemSpace.h \
-$(SOURCE_DIR)/FixVec.h $(SOURCE_DIR)/FixVec.hh \
-$(SOURCE_DIR)/FixVecConvert.h \
-$(SOURCE_DIR)/Flag.h \
-$(SOURCE_DIR)/Global.h \
-$(SOURCE_DIR)/GMResSolver.h $(SOURCE_DIR)/GMResSolver.hh \
-$(SOURCE_DIR)/GMResSolver2.h $(SOURCE_DIR)/GMResSolver2.hh \
-$(SOURCE_DIR)/TFQMR.h $(SOURCE_DIR)/TFQMR.hh \
-$(SOURCE_DIR)/VecSymSolver.h $(SOURCE_DIR)/VecSymSolver.hh \
-$(SOURCE_DIR)/UmfPackSolver.h $(SOURCE_DIR)/UmfPackSolver.hh \
-$(SOURCE_DIR)/PardisoSolver.h $(SOURCE_DIR)/PardisoSolver.hh $(SOURCE_DIR)/PardisoSolver.cc \
-$(SOURCE_DIR)/DuneSolver.h $(SOURCE_DIR)/DuneSolver.hh $(SOURCE_DIR)/DuneSolver.cc \
+$(SOURCE_DIR)/DOFAdmin.h $(SOURCE_DIR)/DOFIterator.h $(SOURCE_DIR)/DOFMatrix.h $(SOURCE_DIR)/DOFVector.h $(SOURCE_DIR)/DOFVector.hh $(SOURCE_DIR)/DOFVector.cc $(SOURCE_DIR)/Element.h $(SOURCE_DIR)/ElementConnection.h \
+$(SOURCE_DIR)/ElInfo.h $(SOURCE_DIR)/ElInfo1d.h $(SOURCE_DIR)/ElInfo2d.h $(SOURCE_DIR)/ElInfo3d.h $(SOURCE_DIR)/Error.h \
+$(SOURCE_DIR)/Error.hh $(SOURCE_DIR)/Estimator.h $(SOURCE_DIR)/Estimator.cc $(SOURCE_DIR)/FiniteElemSpace.h $(SOURCE_DIR)/FixVec.h $(SOURCE_DIR)/FixVec.hh $(SOURCE_DIR)/FixVecConvert.h $(SOURCE_DIR)/Flag.h $(SOURCE_DIR)/Global.h \
+$(SOURCE_DIR)/UmfPackSolver.h \ $(SOURCE_DIR)/UmfPackSolver.hh \
 $(SOURCE_DIR)/Lagrange.h $(SOURCE_DIR)/Line.h \
 $(SOURCE_DIR)/MacroElement.h $(SOURCE_DIR)/MacroWriter.h \
 $(SOURCE_DIR)/Markings.h $(SOURCE_DIR)/Markings.hh \
 $(SOURCE_DIR)/MemoryManager.h \
 $(SOURCE_DIR)/Mesh.h \
-$(SOURCE_DIR)/ODirSolver.h $(SOURCE_DIR)/ODirSolver.hh \
-$(SOURCE_DIR)/OEMSolver.h $(SOURCE_DIR)/OEMSolver.hh \
-$(SOURCE_DIR)/OResSolver.h $(SOURCE_DIR)/OResSolver.hh \
 $(SOURCE_DIR)/Parameters.h \
 $(SOURCE_DIR)/Parametric.h \
-$(SOURCE_DIR)/Preconditioner.h \
 $(SOURCE_DIR)/Quadrature.h \
 $(SOURCE_DIR)/RCNeighbourList.h \
 $(SOURCE_DIRe)/RefinementManager.h \

--- a/AMDiS/bin/Makefile.in
+++ b/AMDiS/bin/Makefile.in
--- a/AMDiS/configure
+++ b/AMDiS/configure
--- a/AMDiS/libtool
+++ b/AMDiS/libtool
@@ -44,7 +44,7 @@ available_tags=" CXX F77"

 # ### BEGIN LIBTOOL CONFIG

-# Libtool was configured on host NWRW15:
+# Libtool was configured on host NWRW03:

 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -93,6 +93,9 @@ CC="gcc"
 # Is the compiler the GNU C compiler?
 with_gcc=yes

+gcc_dir=`gcc -print-file-name=. | /bin/sed 's,/\.$,,'`
+gcc_ver=`gcc -dumpversion`
+
 # An ERE matcher.
 EGREP="grep -E"

@@ -229,11 +232,11 @@ striplib="strip --strip-unneeded"

 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=""
+predep_objects=`echo "" | $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
 # shared library.
-postdep_objects=""
+postdep_objects=`echo "" | $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
 # shared library.
@@ -245,7 +248,7 @@ postdeps=""

 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=""
+compiler_lib_search_path=`echo "" | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`

 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
@@ -325,10 +328,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=`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
-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/lib/octave-3.0.1 /usr/lib/qt-3.3/lib "

 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -6760,7 +6763,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 NWRW03:

 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -6809,6 +6812,9 @@ CC="g++"
 # Is the compiler the GNU C compiler?
 with_gcc=yes

+gcc_dir=`gcc -print-file-name=. | /bin/sed 's,/\.$,,'`
+gcc_ver=`gcc -dumpversion`
+
 # An ERE matcher.
 EGREP="grep -E"

@@ -6942,11 +6948,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=`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
 # 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=`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
 # shared library.
@@ -6958,7 +6964,7 @@ 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/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=`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.
 deplibs_check_method="pass_all"
@@ -7038,10 +7044,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=`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
-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/lib/octave-3.0.1 /usr/lib/qt-3.3/lib "

 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -7065,7 +7071,7 @@ include_expsyms=""

 # ### BEGIN LIBTOOL TAG CONFIG: F77

-# Libtool was configured on host NWRW15:
+# Libtool was configured on host NWRW03:

 # Shell to use when invoking shell scripts.
 SHELL="/bin/sh"
@@ -7109,11 +7115,14 @@ LTCC="gcc"
 LTCFLAGS="-g -O2"

 # A language-specific compiler.
-CC="g77"
+CC="f95"

 # Is the compiler the GNU C compiler?
 with_gcc=yes

+gcc_dir=`gcc -print-file-name=. | /bin/sed 's,/\.$,,'`
+gcc_ver=`gcc -dumpversion`
+
 # An ERE matcher.
 EGREP="grep -E"

@@ -7250,11 +7259,11 @@ striplib="strip --strip-unneeded"

 # Dependencies to place before the objects being linked to create a
 # shared library.
-predep_objects=""
+predep_objects=`echo "" | $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
 # shared library.
-postdep_objects=""
+postdep_objects=`echo "" | $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
 # shared library.
@@ -7266,7 +7275,7 @@ postdeps=""

 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path=""
+compiler_lib_search_path=`echo "" | $SED -e "s@${gcc_dir}@\${gcc_dir}@g;s@${gcc_ver}@\${gcc_ver}@g"`

 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method="pass_all"
@@ -7346,10 +7355,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=`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
-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/lib/octave-3.0.1 /usr/lib/qt-3.3/lib "

 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""

--- a/AMDiS/src/AMDiS.h
+++ b/AMDiS/src/AMDiS.h
@@ -6,13 +6,10 @@
 #include "AdaptStationary.h"
 #include "Assembler.h"
 #include "BasisFunction.h"
-#include "BiCGSolver.h"
 #include "Boundary.h"
-#include "BiCGStab_M.h"
 #include "Boundary.h"
 #include "BoundaryCondition.h"
 #include "BoundaryManager.h"
-#include "CGSolver.h"
 #include "CoarseningManager.h"
 #include "CoarseningManager1d.h"
 #include "CoarseningManager2d.h"
@@ -25,7 +22,6 @@
 #include "DOFIterator.h"
 #include "DOFMatrix.h"
 #include "DOFVector.h"
-#include "DiagonalPreconditioner.h"
 #include "DirichletBC.h"
 #include "DualTraverse.h"
 #include "ElInfo.h"
@@ -41,10 +37,11 @@
 #include "FiniteElemSpace.h"
 #include "FixVec.h"
 #include "Flag.h"
-#include "GMResSolver.h"
 #include "Global.h"
 #include "GridWriter.h"
 #include "InteriorBoundary.h"
+#include "ITL_Preconditioner.h"
+#include "ITL_Solver.h"
 #include "Lagrange.h"
 #include "LeafData.h"
 #include "Line.h"
@@ -61,9 +58,7 @@
 #include "NewtonS.h"
 #include "NonLinSolver.h"
 #include "NonLinUpdater.h"
-#include "ODirSolver.h"
 #include "OEMSolver.h"
-#include "OResSolver.h"
 #include "Operator.h"
 #include "Parameters.h"
 #include "Parametric.h"
@@ -71,7 +66,6 @@
 #include "PeriodicMap.h"
 #include "PeriodicBC.h"
 #include "PngWriter.h"
-#include "Preconditioner.h"
 #include "ProblemScal.h"
 #include "ProblemVec.h"
 #include "ProblemInstat.h"

--- a/AMDiS/src/ODirSolver.h
+++ b/AMDiS/src/ODirSolver.h
@@ -17,85 +17,66 @@
 // ==                                                                        ==
 // ============================================================================

-/** \file ODirSolver.h */
+/** \file AMDiS_fwd.h */

-#ifndef AMDIS_ODIRSOLVER_H
-#define AMDIS_ODIRSOLVER_H

-#include "OEMSolver.h"
-#include "MemoryManager.h"
+#ifndef AMDIS_AMDIS_FWD_INCLUDE
+#define AMDIS_AMDIS_FWD_INCLUDE

 namespace AMDiS {

-  // ============================================================================
-  // ===== class BiCGSolver =====================================================
-  // ============================================================================
-
-  /**
-   * \ingroup Solver
-   * 
-   * \brief
-   * Solves a linear system by the method of orthogonal directions and can be
-   * used for symmetric positive system matrices.
-   */
-  template<typename VectorType>
-  class ODirSolver : public OEMSolver<VectorType>
-  {
-  public:
-    MEMORY_MANAGED(ODirSolver<VectorType>);
-
-    /** \brief
-     * Creator class used in the OEMSolverMap.
-     */
-    class Creator : public OEMSolverCreator<VectorType>
-    {
-    public:
-      MEMORY_MANAGED(Creator);
-
-      virtual ~Creator() {};
-
-      /** \brief
-       * Returns a new ODirSolver object.
-       */   
-      OEMSolver<VectorType>* create() { 
-	return NEW ODirSolver<VectorType>(this->name);
-      };
-    };
-
-    /** \brief
-     * constructor
-     */
-    ODirSolver(std::string name);
-
-    /** \brief
-     * destructor
-     */
-    ~ODirSolver();
-
-  protected:
-    /** \brief
-     * realisation of OEMSolver::solveSystem
-     */
-    int solveSystem(MatVecMultiplier<VectorType> *mv, 
-		    VectorType *x, VectorType *b, bool reuseMatrix);
-
-    /** \brief
-     * realisation of OEMSolver::init
-     */
-    void init();
-
-    /** \brief
-     * realisation of OEMSolver::exit
-     */
-    void exit();
-
-  private:
-    // pointer to memory needed for solveSystem
-    VectorType *Ad, *d, *d_old, *r, *h;
-  };
-
-}
-
-#include "ODirSolver.hh"
-
-#endif // AMDIS_ODIR_SOLVER_H
+  class AdaptInfo;
+  class AdaptStationary;
+  class BasisFunction; 
+  class BoundaryManager;
+  class CGSolver;
+  class CoarseningManager;
+  class DiagonalPreconditioner; 
+  class DOFAdmin; 
+  class DOFMatrix;
+  class Element;
+  class ElementMatrix;
+  class ElementVector;
+  class ElInfo; 
+  class Estimator;
+  class FastQuadrature;
+  class FillInfo; 
+  class FileWriterInterface;
+  class FiniteElemSpace; 
+  class IdentityPreconditioner; 
+  class InterpolRestrictMatrix;
+  class ITL_BasePreconditioner;
+  class LeafDataPeriodic;
+  class LevelAdmin;
+  class Marker;
+  class Mesh; 
+  class MultiGridSortSolver; 
+  class OEMSolver;
+  class Operator;
+  class ProblemInstat;
+  class ProblemIterationInterface;
+  class ProblemVec;
+  class PreconditionerScal;
+  class Quadrature; 
+  class RCNeighbourList;
+  class RefinementManager;
+  class RobinBC;
+  class SystemVector;
+  class VertexVector;
+
+  template<typename ReturnType, typename ArgumentType> class AbstractFunction;
+  template<typename VectorType>                        class MatVecMultiplier;
+  template<typename T>                                 class DOFVectorBase;
+  template<typename T>                                 class DOFVector;
+  template<typename T>                                 class ITL_Preconditioner;
+  template<typename T>                                 class Matrix;
+  template<typename T>                                 class MatVecMultiplier;
+  template<typename T>                                 class SolverMatrix;
+  template<typename T>                                 class SparseVector;
+  template<typename T>                                 class Vector;
+
+  template <typename ITLSolver>    class ITL_OEMSolver;
+
+} // namespace AMDiS
+
+#endif // AMDIS_AMDIS_FWD_INCLUDE
--- a/AMDiS/src/AdaptStationary.h
+++ b/AMDiS/src/AdaptStationary.h
@@ -34,13 +34,10 @@
 #include "MemoryManager.h"
 #include "AdaptInfo.h"
 #include "AdaptBase.h"
+#include "AMDiS_fwd.h"