moved indicator from AlgorithmBase to StepperBase

dune/fem-dg/stepper/baseevolution.hh

@@ -141,9 +141,6 @@ public:
   // choose a suitable GridView
   typedef typename Traits :: GridPartType              GridPartType;
 
-  // the indicator function type (for limiting only)
-  typedef typename Traits :: IndicatorType             IndicatorType;
-
   // type of IOTuple
   typedef typename Traits :: IOTupleType  IOTupleType ;
 
@@ -188,9 +185,6 @@ public:
     return grid_.comm().sum( grSize );
   }
 
-  // return reference to additional variables
-  virtual IndicatorType* indicator()  { return 0; }
-
   //! initialize method for time loop, i.e. L2-project initial data
   virtual void initializeStep( TimeProviderType& tp, const int loop ) = 0;
 

dune/fem-dg/stepper/stepperbase.hh

@@ -79,6 +79,9 @@ struct StepperBase
   // ... as well as the Space type
   typedef typename Traits :: DiscreteSpaceType        DiscreteSpaceType;
 
+  // the indicator function type (for limiting only)
+  typedef typename Traits :: IndicatorType            IndicatorType;
+
   // The ODE Solvers
   typedef typename Traits :: OdeSolverType            OdeSolverType;
   typedef typename OdeSolverType :: MonitorType       OdeSolverMonitorType ;
@@ -112,7 +115,6 @@ struct StepperBase
   // type of adaptation manager
   typedef Dune::Fem::AdaptationManager< GridType, RestrictionProlongationType > AdaptationManagerType ;
 
-  using BaseType :: indicator;
   using BaseType :: grid_ ;
   using BaseType :: limitSolution ;
 
@@ -138,6 +140,7 @@ struct StepperBase
   {
     // set refine weight
     rp_.setFatherChildWeight( Dune::DGFGridInfo<GridType> :: refineWeight() );
+
   }
 
   //! destructor
@@ -393,6 +396,9 @@ struct StepperBase
     return *problem_;
   }
 
+  // return reference to additional variables
+  virtual IndicatorType* indicator()  { return 0; }
+
   virtual const ModelType& model() const = 0 ;
 
 protected: