From 6cdae5f4c20aa374334840cdecd4658f5b456931 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 27 Jul 2017 16:26:51 +0200
Subject: [PATCH] Evaluation: update the generated code

---
 opm/material/densead/Evaluation.hpp   | 13 ++--------
 opm/material/densead/Evaluation1.hpp  | 14 ++---------
 opm/material/densead/Evaluation10.hpp | 32 ++----------------------
 opm/material/densead/Evaluation11.hpp | 34 ++-----------------------
 opm/material/densead/Evaluation12.hpp | 36 ++-------------------------
 opm/material/densead/Evaluation2.hpp  | 16 ++----------
 opm/material/densead/Evaluation3.hpp  | 18 ++------------
 opm/material/densead/Evaluation4.hpp  | 20 ++-------------
 opm/material/densead/Evaluation5.hpp  | 22 ++--------------
 opm/material/densead/Evaluation6.hpp  | 24 ++----------------
 opm/material/densead/Evaluation7.hpp  | 26 ++-----------------
 opm/material/densead/Evaluation8.hpp  | 28 ++-------------------
 opm/material/densead/Evaluation9.hpp  | 30 ++--------------------
 13 files changed, 26 insertions(+), 287 deletions(-)

diff --git a/opm/material/densead/Evaluation.hpp b/opm/material/densead/Evaluation.hpp
index 2b06a72c7..a7b2cd5b7 100644
--- a/opm/material/densead/Evaluation.hpp
+++ b/opm/material/densead/Evaluation.hpp
@@ -80,9 +80,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-       : data_(other.data_)
-    { }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -363,14 +361,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        for (int i = 0; i < length_; ++i) {
-            data_[i] = other.data_[i];
-        }
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation1.hpp b/opm/material/densead/Evaluation1.hpp
index c17353c1c..fead9cba9 100644
--- a/opm/material/densead/Evaluation1.hpp
+++ b/opm/material/densead/Evaluation1.hpp
@@ -75,11 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -344,13 +340,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation10.hpp b/opm/material/densead/Evaluation10.hpp
index 088a20e57..1068fef60 100644
--- a/opm/material/densead/Evaluation10.hpp
+++ b/opm/material/densead/Evaluation10.hpp
@@ -75,20 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-        data_[10] = other.data_[10];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -434,22 +421,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-        data_[10] = other.data_[10];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation11.hpp b/opm/material/densead/Evaluation11.hpp
index ce1743c31..21554f340 100644
--- a/opm/material/densead/Evaluation11.hpp
+++ b/opm/material/densead/Evaluation11.hpp
@@ -75,21 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-        data_[10] = other.data_[10];
-        data_[11] = other.data_[11];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -444,23 +430,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-        data_[10] = other.data_[10];
-        data_[11] = other.data_[11];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation12.hpp b/opm/material/densead/Evaluation12.hpp
index 15a6fe2de..9f434005d 100644
--- a/opm/material/densead/Evaluation12.hpp
+++ b/opm/material/densead/Evaluation12.hpp
@@ -75,22 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-        data_[10] = other.data_[10];
-        data_[11] = other.data_[11];
-        data_[12] = other.data_[12];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -454,24 +439,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-        data_[10] = other.data_[10];
-        data_[11] = other.data_[11];
-        data_[12] = other.data_[12];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation2.hpp b/opm/material/densead/Evaluation2.hpp
index 1c9b9efca..8ed88cfdf 100644
--- a/opm/material/densead/Evaluation2.hpp
+++ b/opm/material/densead/Evaluation2.hpp
@@ -75,12 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -354,14 +349,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation3.hpp b/opm/material/densead/Evaluation3.hpp
index c715acd08..5b9957177 100644
--- a/opm/material/densead/Evaluation3.hpp
+++ b/opm/material/densead/Evaluation3.hpp
@@ -75,13 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -364,15 +358,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation4.hpp b/opm/material/densead/Evaluation4.hpp
index 978f37f4e..f4fd4c222 100644
--- a/opm/material/densead/Evaluation4.hpp
+++ b/opm/material/densead/Evaluation4.hpp
@@ -75,14 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -374,16 +367,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation5.hpp b/opm/material/densead/Evaluation5.hpp
index 36577c46c..8920c3dc0 100644
--- a/opm/material/densead/Evaluation5.hpp
+++ b/opm/material/densead/Evaluation5.hpp
@@ -75,15 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -384,17 +376,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation6.hpp b/opm/material/densead/Evaluation6.hpp
index eca218b8d..653a650af 100644
--- a/opm/material/densead/Evaluation6.hpp
+++ b/opm/material/densead/Evaluation6.hpp
@@ -75,16 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -394,18 +385,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation7.hpp b/opm/material/densead/Evaluation7.hpp
index 8703ef515..d394c4ebd 100644
--- a/opm/material/densead/Evaluation7.hpp
+++ b/opm/material/densead/Evaluation7.hpp
@@ -75,17 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -404,19 +394,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation8.hpp b/opm/material/densead/Evaluation8.hpp
index 5165f07b5..590fa62a6 100644
--- a/opm/material/densead/Evaluation8.hpp
+++ b/opm/material/densead/Evaluation8.hpp
@@ -75,18 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -414,20 +403,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const
diff --git a/opm/material/densead/Evaluation9.hpp b/opm/material/densead/Evaluation9.hpp
index fe8f7343a..125940e08 100644
--- a/opm/material/densead/Evaluation9.hpp
+++ b/opm/material/densead/Evaluation9.hpp
@@ -75,19 +75,7 @@ public:
     {}
 
     //! copy other function evaluation
-    Evaluation(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-    }
+    Evaluation(const Evaluation& other) = default;
 
     // create an evaluation which represents a constant function
     //
@@ -424,21 +412,7 @@ public:
     }
 
     // copy assignment from evaluation
-    Evaluation& operator=(const Evaluation& other)
-    {
-        data_[0] = other.data_[0];
-        data_[1] = other.data_[1];
-        data_[2] = other.data_[2];
-        data_[3] = other.data_[3];
-        data_[4] = other.data_[4];
-        data_[5] = other.data_[5];
-        data_[6] = other.data_[6];
-        data_[7] = other.data_[7];
-        data_[8] = other.data_[8];
-        data_[9] = other.data_[9];
-
-        return *this;
-    }
+    Evaluation& operator=(const Evaluation& other) = default;
 
     template <class RhsValueType>
     bool operator==(const RhsValueType& other) const