with the new discrete functions, the norm doesn't need to be given the grid level any more

[[Imported from SVN: r1306]]

fem/norms/l2norm.hh

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#ifndef __DUNE_L2NORM_HH__
-#define __DUNE_L2NORM_HH__
+#ifndef DUNE_L2NORM_HH
+#define DUNE_L2NORM_HH
 
 #include <dune/fem/norms/norm.hh>
 #include <dune/quadrature/fixedorder.hh>
@@ -15,7 +15,7 @@ namespace Dune {
     typedef typename DiscreteFunctionType::FunctionSpaceType FunctionSpaceType;
 
   public:
-    double compute (const DiscreteFunctionType &discFunc, int level)
+    double compute (const DiscreteFunctionType &discFunc)
     {
 
       /** \todo Automatically choose the correct quadrature order */
@@ -35,6 +35,7 @@ namespace Dune {
 
       double sum = 0.0;
       LocalFuncType lf = (const_cast<DiscreteFunctionType*>(&discFunc))->newLocalFunction();
+      int level = functionSpace_.level();
       LevelIterator endit = grid.template lend<0> ( level );
       LevelIterator it = grid.template lbegin<0> ( level );
 

fem/norms/norm.hh

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#ifndef __DUNE_NORM_HH__
-#define __DUNE_NORM_HH__
+#ifndef DUNE_NORM_HH
+#define DUNE_NORM_HH
 
 namespace Dune {
 
@@ -12,7 +12,7 @@ namespace Dune {
   public:
 
     //! Compute the norm
-    virtual double compute(const DiscFuncType& f, int level) = 0;
+    virtual double compute(const DiscFuncType& f) = 0;
 
   };