From 5b0285d44aefeac7f4543a0676f24c009a2fa6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Gr=C3=BCninger?= <gruenich@dune-project.org>
Date: Fri, 4 Dec 2015 11:41:27 +0100
Subject: [PATCH] [SuperLU] Remove support for SuperLU older then August 2005
It was already deprecated and disabled for quite some time.
---
config.h.cmake | 3 ---
dune/istl/superlu.hh | 21 ---------------------
dune/istl/supermatrix.hh | 22 +---------------------
3 files changed, 1 insertion(+), 45 deletions(-)
diff --git a/config.h.cmake b/config.h.cmake
index d419a47cf..f4a300722 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 1aeeb885c..5f3667794 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 582f6215e..e5fb16a69 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
--
GitLab