removed the class template parameter 'DiscFuncType'

[[Imported from SVN: r1123]]

io/file/amiramesh/amirameshwriter.cc

@@ -8,9 +8,9 @@
 
 #if _3
 /** \todo Make sure that the grid is three-dimensional */
-template<class GridType, class DiscFuncType>
-void Dune::AmiraMeshWriter<GridType, DiscFuncType>::writeGrid(const GridType& grid,
-                                                              const std::string& filename)
+template<class GridType>
+void Dune::AmiraMeshWriter<GridType>::writeGrid(const GridType& grid,
+                                                const std::string& filename)
 {
   // Temporary:  we write this level
   int level = grid.maxlevel();
@@ -157,9 +157,9 @@ void Dune::AmiraMeshWriter<GridType, DiscFuncType>::writeGrid(const GridType& gr
 
 
 #ifdef _2
-template<class GridType, class DiscFuncType>
-void Dune::AmiraMeshWriter<GridType, DiscFuncType>::writeGrid(const GridType& grid,
-                                                              const std::string& filename)
+template<class GridType>
+void Dune::AmiraMeshWriter<GridType>::writeGrid(const GridType& grid,
+                                                const std::string& filename)
 {
 
   // Temporary:  we write this level
@@ -299,9 +299,10 @@ void Dune::AmiraMeshWriter<GridType, DiscFuncType>::writeGrid(const GridType& gr
 }
 #endif // #ifdef _2
 
-template<class GridType, class DiscFuncType>
-void Dune::AmiraMeshWriter<GridType, DiscFuncType>::writeFunction(const DiscFuncType& f,
-                                                                  const std::string& filename)
+template<class GridType>
+template<class DiscFuncType>
+void Dune::AmiraMeshWriter<GridType>::writeFunction(const DiscFuncType& f,
+                                                    const std::string& filename)
 {
   // Get grid type associated with DiscFuncType
   typedef typename DiscFuncType::FunctionSpaceType FunctionSpaceType;
@@ -354,9 +355,9 @@ void Dune::AmiraMeshWriter<GridType, DiscFuncType>::writeFunction(const DiscFunc
 
 
 
-template<class GridType, class DiscFuncType>
-void Dune::AmiraMeshWriter<GridType, DiscFuncType>::writeBlockVector(const Dune::BlockVector<Dune::FieldVector<double, 3> >& f,
-                                                                     const std::string& filename)
+template<class GridType>
+void Dune::AmiraMeshWriter<GridType>::writeBlockVector(const Dune::BlockVector<Dune::FieldVector<double, 3> >& f,
+                                                       const std::string& filename)
 {
   typedef Dune::BlockVector<Dune::FieldVector<double, 3> > VectorType;
 

io/file/amirameshwriter.hh

 // -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 // vi: set et ts=4 sw=2 sts=2:
-#ifndef __DUNE_AMIRAMESHWRITER_HH__
-#define __DUNE_AMIRAMESHWRITER_HH__
+#ifndef DUNE_AMIRAMESH_WRITER_HH
+#define DUNE_AMIRAMESH_WRITER_HH
 
 #include <string>
 #include <dune/istl/bvector.hh>
@@ -21,7 +21,7 @@ namespace Dune {
    * \todo As DiscFuncType is supposed to know its GridType we can
    * delete the first template parameter.
    */
-  template<class GRID, class DiscFuncType>
+  template<class GridType>
   class AmiraMeshWriter {
 
   public:
@@ -31,7 +31,7 @@ namespace Dune {
      * @param grid The grid objects that is to be written
      * @param filename The filename
      */
-    static void writeGrid(const GRID& grid,
+    static void writeGrid(const GridType& grid,
                           const std::string& filename);
 
     /** \brief Writes a discrete function in AmiraMesh format
@@ -39,6 +39,7 @@ namespace Dune {
      * @param f Function that should be written
      * @param filename The filename
      */
+    template <class DiscFuncType>
     static void writeFunction(const DiscFuncType& f,
                               const std::string& filename);