Cleanup merge fallout.

Author: Robert Kloefkorn

ewoms/disc/common/fvbasediscretization.hh

@@ -50,6 +50,7 @@
 #include <ewoms/parallel/gridcommhandles.hh>
 #include <ewoms/parallel/threadmanager.hh>
 #include <ewoms/linear/nullborderlistmanager.hh>
+#include <ewoms/linear/istlsparsematrixadapter.hh>
 #include <ewoms/common/simulator.hh>
 #include <ewoms/common/alignedallocator.hh>
 #include <ewoms/common/timer.hh>
@@ -75,8 +76,7 @@
 #include <dune/fem/space/common/restrictprolongtuple.hh>
 #include <dune/fem/function/blockvectorfunction.hh>
 #include <dune/fem/misc/capabilities.hh>
-#include <ewoms/linear/femsparsematrixadapter.hh>
-#endif // endif HAVE_DUNE_FEM
+#endif
 
 #include <limits>
 #include <list>
@@ -130,40 +130,7 @@ SET_TYPE_PROP(FvBaseDiscretization, DiscExtensiveQuantities, Ewoms::FvBaseExtens
 //! Calculates the gradient of any quantity given the index of a flux approximation point
 SET_TYPE_PROP(FvBaseDiscretization, GradientCalculator, Ewoms::FvBaseGradientCalculator<TypeTag>);
 
-//! Set the type of a global Jacobian matrix from the solution types
-#if HAVE_DUNE_FEM
-SET_PROP(FvBaseDiscretization, DiscreteFunction)
-{
-private:
-    typedef typename GET_PROP_TYPE(TypeTag, DiscreteFunctionSpace) DiscreteFunctionSpace;
-    typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables)      PrimaryVariables;
-public:
-    // discrete function storing solution data
-    typedef Dune::Fem::ISTLBlockVectorDiscreteFunction<DiscreteFunctionSpace, PrimaryVariables> type;
-};
-#endif
-
-#if USE_DUNE_FEM_SOLVERS
-SET_PROP(FvBaseDiscretization, SparseMatrixAdapter)
-{
-private:
-    typedef typename GET_PROP_TYPE(TypeTag, DiscreteFunctionSpace) DiscreteFunctionSpace;
-    // discrete function storing solution data
-    typedef Dune::Fem::ISTLBlockVectorDiscreteFunction<DiscreteFunctionSpace> DiscreteFunction;
-public:
-
-#if USE_DUNE_FEM_PETSC_SOLVERS
-#warning "Using Dune-Fem PETSc solvers"
-    typedef FemPetscMatrixAdapter< DiscreteFunction > type;
-#elif USE_DUNE_FEM_VIENNACL_SOLVERS
-#warning "Using Dune-Fem ViennaCL solvers"
-    typedef FemSparseRowMatrixAdapter< DiscreteFunction > type;
-#else
-#warning "Using Dune-Fem ISTL solvers"
-    typedef FemISTLMatrixAdapter< DiscreteFunction > type;
-#endif
-};
-#else
+//! Set the type of a global jacobian matrix from the solution types
 SET_PROP(FvBaseDiscretization, SparseMatrixAdapter)
 {
 private:
@@ -174,7 +141,6 @@ private:
 public:
     typedef typename Ewoms::Linear::IstlSparseMatrixAdapter<Block> type;
 };
-#endif
 
 //! The maximum allowed number of timestep divisions for the
 //! Newton solver

ewoms/linear/femsolverbackend.hh

@@ -115,52 +115,9 @@ public:
     typedef Dune::Fem::ISTLBlockVectorDiscreteFunction<DiscreteFunctionSpace, PrimaryVariables> type;
 };
 
-SET_PROP(FemSolverBackend, SparseMatrixAdapter)
-{
-private:
-    typedef typename GET_PROP_TYPE(TypeTag, DiscreteFunctionSpace) DiscreteFunctionSpace;
-    typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-    // discrete function storing solution data
-    typedef Dune::Fem::ISTLBlockVectorDiscreteFunction<DiscreteFunctionSpace> DiscreteFunction;
-
-#if USE_DUNE_FEM_PETSC_SOLVERS
-#warning "Using Dune-Fem PETSc solvers"
-    typedef Dune::Fem::PetscLinearOperator<DiscreteFunction, DiscreteFunction> LinearOperator;
-#elif USE_DUNE_FEM_VIENNACL_SOLVERS
-#warning "Using Dune-Fem ViennaCL solvers"
-    typedef Dune::Fem::SparseRowLinearOperator <DiscreteFunction, DiscreteFunction> LinearOperator;
-#else
-#warning "Using Dune-Fem ISTL solvers"
-    typedef Dune::Fem::ISTLLinearOperator <DiscreteFunction, DiscreteFunction> LinearOperator;
-#endif
-
-    struct FemMatrixBackend : public LinearOperator
-    {
-        typedef LinearOperator ParentType;
-        typedef typename LinearOperator::MatrixType Matrix;
-        typedef typename ParentType::MatrixBlockType MatrixBlock;
-        template <class Simulator>
-        FemMatrixBackend(Simulator& simulator)
-            : LinearOperator("eWoms::Jacobian", space_, space_)
-            , space_(simulator.vanguard().gridPart())
-        {}
-
-        void commit()
-        { this->flushAssembly(); }
-
-        template <class LocalBlock>
-        void addToBlock (const size_t row, const size_t col, const LocalBlock& block)
-        { this->addBlock(row, col, block); }
-
-        void clearRow(const size_t row, const Scalar diag = 1.0)
-        { this->unitRow(row); }
-
-        DiscreteFunctionSpace space_;
-    };
-
-public:
-    typedef FemMatrixBackend type;
-};
+// todo
+SET_PROP_TYPE(FemSolverBackend, SparseMatrixAdapter, GET_PROP_TYPE( TypeTag,
+            FemSolverBackend:: ));
 
 
 END_PROPERTIES
@@ -180,7 +137,6 @@ protected:
 
     typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-    typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) LinearOperator;
     typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
     typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) Vector;
     typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -192,37 +148,31 @@ protected:
     typedef Dune::Fem::ISTLBlockVectorDiscreteFunction<DiscreteFunctionSpace>
         VectorWrapperDiscreteFunction;
 
-    template <int d, class LinOp>
-    struct SolverSelector
-    {
-        typedef Dune::Fem::KrylovInverseOperator<VectorWrapperDiscreteFunction>  type;
-    };
+    template <int d, class SparseMatBackend>
+    struct SolverSelector;
 
-#if HAVE_PETSC
     template <int d>
-    struct SolverSelector<d, Dune::Fem::PetscLinearOperator<VectorWrapperDiscreteFunction, VectorWrapperDiscreteFunction>>
+    struct SolverSelector< d, FemSparseRowMatrixAdapter >
     {
-        typedef Dune::Fem::PetscInverseOperator<VectorWrapperDiscreteFunction, LinearOperator>  type;
+        typedef Dune::Fem::KrylovInverseOperator<VectorWrapperDiscreteFunction>  type;
     };
-#endif
 
-#if HAVE_VIENNACL
-    template <int d>
-    struct SolverSelector<d, Dune::Fem::SparseRowLinearOperator<VectorWrapperDiscreteFunction, VectorWrapperDiscreteFunction> >
+#if HAVE_PETSC
+    template <int d >
+    struct SolverSelector<d, FemPetscMatrixAdapter >
     {
-        typedef Dune::Fem::ViennaCLInverseOperator<VectorWrapperDiscreteFunction>  type;
+        typedef Dune::Fem::PetscInverseOperator<VectorWrapperDiscreteFunction>  type;
     };
 #endif
 
     template <int d>
-    struct SolverSelector<d, Dune::Fem::ISTLLinearOperator<VectorWrapperDiscreteFunction, VectorWrapperDiscreteFunction> >
+    struct SolverSelector<d, FemISTLMatrixAdapter >
     {
-        typedef Dune::Fem::ISTLBICGSTABOp<VectorWrapperDiscreteFunction, LinearOperator>  type;
+        typedef Dune::Fem::ISTLBICGSTABOp<VectorWrapperDiscreteFunction >  type;
     };
 
     // select solver type depending on linear operator type
-    typedef typename LinearOperator::ParentType Bla;
-    typedef typename SolverSelector<0, Bla>::type InverseLinearOperator;
+    typedef typename SolverSelector<0, SparseMatrixAdapter>::type InverseLinearOperator;
 
     enum { dimWorld = GridView::dimensionworld };