Fixes usage of firstmatrixelement with DUNE 2.8

The function name is now CamelCase and the old
naming scheme is deprecated. Hence we use the new naming
for 2.8
There was also a compilation problem due to header inclusion
order for that function. The compiler did not find our version
the correct version. With this change compilation succeeds again.

opm/simulators/linalg/ilufirstelement.hh

@@ -0,0 +1,41 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+
+#ifndef EWOMS_ILU_FIRSTELEMENT_HH
+#define EWOMS_ILU_FIRSTELEMENT_HH
+#include <dune/common/version.hh>
+#include <opm/simulators/linalg/matrixblock.hh>
+
+namespace Opm
+{
+template<class K, int n, int m>
+#if DUNE_VERSION_GTE(DUNE_GRID, 2, 8)
+K& firstMatrixElement(MatrixBlock<K, n, m>& A)
+#else
+K& firstmatrixelement(MatrixBlock<K, n, m>& A)
+#endif
+{ return A[0][0]; }
+}
+#endif // EWOMS_ILU_FIRSTELEMENT_HH
+
+

opm/simulators/linalg/istlpreconditionerwrappers.hh

@@ -47,7 +47,7 @@
 #include <opm/models/utils/propertysystem.hh>
 #include <opm/models/utils/parametersystem.hh>
 #include <opm/simulators/linalg/linalgproperties.hh>
-
+#include <opm/simulators/linalg/ilufirstelement.hh> //definitions needed in next header
 #include <dune/istl/preconditioners.hh>
 
 #include <dune/common/version.hh>

opm/simulators/linalg/matrixblock.hh

@@ -25,12 +25,14 @@
 
 #include <dune/istl/scalarproducts.hh>
 #include <dune/istl/operators.hh>
-#include <dune/istl/preconditioners.hh>
 #include <dune/istl/solvers.hh>
 #include <dune/istl/owneroverlapcopy.hh>
-#include <dune/istl/paamg/amg.hh>
+#include <dune/istl/superlu.hh>
+#include <dune/istl/umfpack.hh>
+
 
 #include <dune/common/fmatrix.hh>
+#include <dune/common/typetraits.hh>
 
 namespace Opm {
 namespace MatrixBlockHelp {
@@ -247,10 +249,6 @@ void print_row(std::ostream& s, const Opm::MatrixBlock<K, n, m>& A,
                int precision)
 { print_row(s, A.asBase(), I, J, therow, width, precision); }
 
-template<class K, int n, int m>
-K& firstmatrixelement(Opm::MatrixBlock<K, n, m>& A)
-{ return firstmatrixelement(A.asBase()); }
-
 template <typename Scalar, int n, int m>
 struct MatrixDimension<Opm::MatrixBlock<Scalar, n, m> >
     : public MatrixDimension<typename Opm::MatrixBlock<Scalar, n, m>::BaseType>
@@ -297,6 +295,11 @@ public:
 };
 #endif
 
+template<typename T, int n, int m>
+struct IsNumber<Opm::MatrixBlock<T, n, m>>
+    : public IsNumber<Dune::FieldMatrix<T,n,m>>
+{};
+
 } // end namespace Dune
 
 

opm/simulators/linalg/overlappingbcrsmatrix.hh

@@ -36,7 +36,6 @@
 
 #include <dune/istl/scalarproducts.hh>
 #include <dune/istl/io.hh>
-
 #include <algorithm>
 #include <set>
 #include <map>

opm/simulators/linalg/overlappingpreconditioner.hh

@@ -30,8 +30,8 @@
 #include "overlappingscalarproduct.hh"
 
 #include <opm/material/common/Exceptions.hpp>
-
-#include <dune/istl/preconditioners.hh>
+#include <opm/simulators/linalg/ilufirstelement.hh> //definitions needed in next header
+#include <dune/istl/preconditioner.hh>
 
 #include <dune/common/version.hh>