diff --git a/config.h.cmake b/config.h.cmake index d419a47cf9663f047c1ee74eb34cd5983c754331..f4a3007220fe723821ef9f858f6dc3fb4794cd1b 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -34,9 +34,6 @@ /* Define to ENABLE_ARPACKPP if the ARPACK++ library is available */ #cmakedefine HAVE_ARPACKPP ENABLE_ARPACKPP -/* define to 1 because older versions of SuperLU are no longer supported*/ -#define SUPERLU_POST_2005_VERSION 1 - /* Define to 1 if 'expansions' is a member of 'mem_usage_t'. */ #cmakedefine HAVE_MEM_USAGE_T_EXPANSIONS @HAVE_MEM_USAGE_T_EXPANSIONS@ diff --git a/dune/istl/superlu.hh b/dune/istl/superlu.hh index 1aeeb885cb814e87f54cf5115ae63431ea572c8c..5f36677949808ed358c7ec313c8ff5a5f0da46cc 100644 --- a/dune/istl/superlu.hh +++ b/dune/istl/superlu.hh @@ -13,7 +13,6 @@ #ifndef SUPERLU_NTYPE #define SUPERLU_NTYPE 1 #endif -#ifdef SUPERLU_POST_2005_VERSION #if SUPERLU_NTYPE==0 #include "slu_sdefs.h" @@ -31,26 +30,6 @@ #include "slu_zdefs.h" #endif -#else - -#if SUPERLU_NTYPE==0 -#include "ssp_defs.h" -#endif - -#if SUPERLU_NTYPE==1 -#include "dsp_defs.h" -#warning Support for SuperLU older than SuperLU 3.0 from August 2005 is deprecated. -#endif - -#if SUPERLU_NTYPE==2 -#include "csp_defs.h" -#endif - -#if SUPERLU_NTYPE>=3 -#include "zsp_defs.h" -#endif - -#endif #include "solvers.hh" #include "supermatrix.hh" #include <algorithm> diff --git a/dune/istl/supermatrix.hh b/dune/istl/supermatrix.hh index 582f6215e0bb01bde151daef1f2a1f05b4fb396a..e5fb16a6939cd955e8a255d9c2967b69c3867f9a 100644 --- a/dune/istl/supermatrix.hh +++ b/dune/istl/supermatrix.hh @@ -4,7 +4,6 @@ #define DUNE_ISTL_SUPERMATRIX_HH #if HAVE_SUPERLU -#ifdef SUPERLU_POST_2005_VERSION #ifndef SUPERLU_NTYPE #define SUPERLU_NTYPE 1 @@ -26,25 +25,6 @@ #include "slu_zdefs.h" #endif -#else - -#if SUPERLU_NTYPE==0 -#include "ssp_defs.h" -#endif - -#if SUPERLU_NTYPE==1 -#include "dsp_defs.h" -#endif - -#if SUPERLU_NTYPE==2 -#include "csp_defs.h" -#endif - -#if SUPERLU_NTYPE>=3 -#include "zsp_defs.h" -#endif - -#endif #include "bcrsmatrix.hh" #include "bvector.hh" #include <dune/common/fmatrix.hh> @@ -350,5 +330,5 @@ namespace Dune SuperLUMatrix* slumat; }; } -#endif +#endif // HAVE_SUPERLU #endif