[functions] added type()

dune/stuff/functions/ESV2007.hh

@@ -244,6 +244,11 @@ public:
 
   ThisType& operator=(const ThisType& /*other*/) = delete;
 
+  virtual std::string type() const DS_OVERRIDE DS_FINAL
+  {
+    return BaseType::static_id() + ".ESV2007.testcase1.force";
+  }
+
   virtual std::string name() const DS_OVERRIDE DS_FINAL
   {
     return name_;
@@ -347,6 +352,11 @@ public:
 
   ThisType& operator=(const ThisType& /*other*/) = delete;
 
+  virtual std::string type() const DS_OVERRIDE DS_FINAL
+  {
+    return BaseType::static_id() + ".ESV2007.testcase1.exactsolution";
+  }
+
   virtual std::string name() const DS_OVERRIDE DS_FINAL
   {
     return name_;

dune/stuff/functions/checkerboard.hh

@@ -199,6 +199,11 @@ public:
     return new ThisType(*this);
   }
 
+  virtual std::string type() const DS_OVERRIDE
+  {
+    return BaseType::static_id() + ".checkerboard";
+  }
+
   virtual std::string name() const DS_OVERRIDE
   {
     return name_;

dune/stuff/functions/combined.hh

@@ -151,6 +151,11 @@ public:
     return new ThisType(minuend_, subtrahend_);
   }
 
+  virtual std::string type() const DS_OVERRIDE
+  {
+    return "difference between '" + minuend_.type() + "' and '" + subtrahend_.type() + "'";
+  }
+
   virtual std::string name() const DS_OVERRIDE
   {
     return "difference between '" + minuend_.name() + "' and '" + subtrahend_.name() + "'";

dune/stuff/functions/constant.hh

@@ -81,6 +81,11 @@ public:
   {
   }
 
+  virtual std::string type() const DS_OVERRIDE
+  {
+    return BaseType::static_id() + ".constant";
+  }
+
   virtual size_t order() const DS_OVERRIDE DS_FINAL
   {
     return 0;

dune/stuff/functions/expression.hh

@@ -156,6 +156,11 @@ public:
     return *this;
   }
 
+  virtual std::string type() const DS_OVERRIDE DS_FINAL
+  {
+    return BaseType::static_id() + ".expression";
+  }
+
   virtual std::string name() const DS_OVERRIDE
   {
     return name_;

dune/stuff/functions/interfaces.hh

@@ -310,6 +310,11 @@ public:
 
   /** \defgroup info ´´These methods should be implemented in order to identify the function.'' */
   /* @{ */
+  virtual std::string type() const
+  {
+    return "stuff.function";
+  }
+
   virtual std::string name() const
   {
     return "stuff.function";

dune/stuff/functions/spe10.hh

@@ -94,22 +94,9 @@ private:
       return data;
     } else
       DUNE_THROW_COLORFULLY(Dune::IOError, "could not open '" << filename << "'!");
-  } // Spe10Model1()
+  } // ... read_values_from_file(...)
 
 public:
-  Spe10Model1(const std::string& filename, std::vector<DomainFieldType>&& lowerLeft,
-              std::vector<DomainFieldType>&& upperRight, const RangeFieldType min = minValue,
-              const RangeFieldType max = maxValue, const std::string nm = static_id())
-    : BaseType(std::move(lowerLeft), std::move(upperRight), {numXelements, numZelements},
-               read_values_from_file(filename, min, max), nm)
-  {
-  }
-
-  virtual ThisType* copy() const DS_OVERRIDE
-  {
-    return new ThisType(*this);
-  }
-
   static Common::ConfigTree default_config(const std::string sub_name = "")
   {
     Common::ConfigTree config;
@@ -143,6 +130,24 @@ public:
         cfg.get("max_val", maxValue),
         cfg.get("name", default_cfg.get<std::string>("name")));
   } // ... create(...)
+
+  Spe10Model1(const std::string& filename, std::vector<DomainFieldType>&& lowerLeft,
+              std::vector<DomainFieldType>&& upperRight, const RangeFieldType min = minValue,
+              const RangeFieldType max = maxValue, const std::string nm = static_id())
+    : BaseType(std::move(lowerLeft), std::move(upperRight), {numXelements, numZelements},
+               read_values_from_file(filename, min, max), nm)
+  {
+  }
+
+  virtual std::string type() const DS_OVERRIDE
+  {
+    return BaseType::static_id() + ".spe10.model1";
+  }
+
+  virtual ThisType* copy() const DS_OVERRIDE
+  {
+    return new ThisType(*this);
+  }
 }; // class Spe10Model1< ..., 2, ..., 1, 1 >