[cleanup] Clean up includes, pre-processor code, closing CMake if's

dune/istl/eigenvalue/test/CMakeLists.txt

@@ -7,14 +7,14 @@ if(SUPERLU_FOUND)
   add_dune_superlu_flags(poweriterationsuperlutest)
   dune_add_test(TARGET poweriterationsuperlutest)
   target_link_libraries(poweriterationsuperlutest dunecommon)
-endif(SUPERLU_FOUND)
+endif()
 
 if(ARPACKPP_FOUND)
   add_executable(arpackpptest cond2test.cc)
   add_dune_arpackpp_flags(arpackpptest)
   target_link_libraries(arpackpptest dunecommon)
   dune_add_test(TARGET arpackpptest)
-endif(ARPACKPP_FOUND)
+endif()
 
 if(ARPACKPP_FOUND AND SUPERLU_FOUND)
   dune_add_test(NAME arpackppsuperlutest

dune/istl/eigenvalue/test/cond2test.cc

-#include "config.h"
+#include <config.h>
 
 #include <iostream>
 
@@ -52,15 +52,9 @@ int main (int argc, char** argv)
 
     return 0;
   }
-  catch (Dune::Exception& e)
-  {
-    std::cerr << "Dune reported error: " << e << std::endl;
-    return 1;
-  }
   catch (std::exception& e)
   {
-    std::cerr << "Standard library reported error: " << e.what() << std::endl;
-    return 1;
+    throw;
   }
   catch (...)
   {

dune/istl/paamg/test/CMakeLists.txt

@@ -51,7 +51,7 @@ if(SUPERLU_FOUND)
   add_dune_superlu_flags(superlufastamgtest)
   target_link_libraries(superlufastamgtest ${DUNE_LIBS})
   dune_add_test(TARGET superlufastamgtest)
-endif(SUPERLU_FOUND)
+endif()
 
 if(SuiteSparse_UMFPACK_FOUND)
   dune_add_test(NAME umfpackamgtest

dune/istl/pardiso.hh

@@ -6,7 +6,7 @@
 #include <dune/istl/preconditioners.hh>
 #include <dune/istl/solvertype.hh>
 
-#ifdef HAVE_PARDISO
+#if HAVE_PARDISO
 // PARDISO prototypes
 extern "C" void pardisoinit(void *, int *, int *, int *, double *, int *);
 

dune/istl/test/complexrhstest.cc

@@ -7,10 +7,8 @@
  *        \f$A*x = b\f$ with \f$A\f$ being a \f$N^2 \times N^2\f$
  *        Laplacian and \f$b\f$ a complex valued rhs.
  */
+#include <config.h>
 
-#if HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include <complex>
 
 #include <dune/istl/bvector.hh>
@@ -188,6 +186,8 @@ int main(int argc, char** argv)
 #if HAVE_SUPERLU
   Dune::SuperLU<BCRSMat> solverSuperLU(mat, true);
   std::cout << "SuperLU converged:  "<< solverTest(solverSuperLU) << std::endl <<  std::endl;
+#else
+  std::cout << "SuperLU skipped because not found." << std::endl <<  std::endl;
 #endif
 
   typedef  Dune::GradientSolver<Vector> GradientSolver;

dune/istl/test/overlappingschwarztest.cc

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#include "config.h"
+#include <config.h>
+
 #include <dune/istl/io.hh>
 #include <dune/istl/bvector.hh>
 #include <dune/istl/operators.hh>

dune/istl/test/superlutest.cc

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#include "config.h"
+#include <config.h>
 
 #include <complex>
 

dune/istl/test/test_pardiso.cc

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
+#include <config.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <cmath>
 
-#include "config.h"
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/io.hh>
 #include <dune/istl/operators.hh>

dune/istl/test/umfpacktest.cc

-#include "config.h"
+#include <config.h>
 
 #include <complex>
-#include<iostream>
+#include <iostream>
 
 #include <dune/common/fmatrix.hh>
 #include <dune/common/fvector.hh>