specify the type for the data storage via EvaluationOps

opm/material/densead/Evaluation.hpp

@@ -66,6 +66,8 @@ private:
     static constexpr int dend_ = Eval::dend_ ;
 
 public:
+    typedef std::array<ValueT, length_> DataVector;
+
     static inline void clearDerivatives(Eval& a)
     {
         for (int i = dstart_; i < dend_; ++i)
@@ -472,7 +474,7 @@ public:
     }
 
 protected:
-    std::array<ValueType, length_> data_;
+    typename Ops::DataVector data_;
 };
 
 template <class RhsValueType, class ValueType, int numVars>

opm/material/densead/Evaluation1.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 1 > Eval;
 
 public:
+    typedef std::array<ValueT, 2 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation10.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 10 > Eval;
 
 public:
+    typedef std::array<ValueT, 11 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation11.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 11 > Eval;
 
 public:
+    typedef std::array<ValueT, 12 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation12.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 12 > Eval;
 
 public:
+    typedef std::array<ValueT, 13 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation2.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 2 > Eval;
 
 public:
+    typedef std::array<ValueT, 3 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation3.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 3 > Eval;
 
 public:
+    typedef std::array<ValueT, 4 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation4.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 4 > Eval;
 
 public:
+    typedef std::array<ValueT, 5 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation5.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 5 > Eval;
 
 public:
+    typedef std::array<ValueT, 6 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation6.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 6 > Eval;
 
 public:
+    typedef std::array<ValueT, 7 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation7.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 7 > Eval;
 
 public:
+    typedef std::array<ValueT, 8 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation8.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 8 > Eval;
 
 public:
+    typedef std::array<ValueT, 9 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/Evaluation9.hpp

@@ -41,6 +41,8 @@ private:
     typedef Evaluation<ValueT, 9 > Eval;
 
 public:
+    typedef std::array<ValueT, 10 > DataVector;
+
     static inline void assign(Eval& a, const Eval& b)
     {
 

opm/material/densead/EvaluationSpecializations.hpp

@@ -44,4 +44,5 @@
 #include <opm/material/densead/Evaluation11.hpp>
 #include <opm/material/densead/Evaluation12.hpp>
 
+
 #endif // OPM_DENSEAD_EVALUATION_SPECIALIZATIONS_HPP