Merge pull request #4 from andlaus/generated_eval_specializations_v3

dense AD: fix a few stupid bugs due to code generation

bin/genEvalSpecializations.py

@@ -205,8 +205,13 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
+{% if numDerivs < 0 %}
+        for (int i = dstart_; i < dend_; ++i)
             data_[i] = other.data_[i];
+{% else %}
+{% for i in range(1, numDerivs+1) %}
+        data_[{{i}}] = other.data_[{{i}}];{% endfor %}
+{% endif %}
     }
 
 
@@ -269,7 +274,7 @@ public:
 
         //  derivatives
 {% if numDerivs < 0 %}
-        for (int i = 0; i < length_; ++i)
+        for (int i = dstart_; i < dend_; ++i)
             this->data_[i] = this->data_[i]*v + other.data_[i] * u;
 {% else %}
 {% for i in range(1, numDerivs+1) %}
@@ -306,7 +311,7 @@ public:
 
         //  derivatives
 {% if numDerivs < 0 %}
-        for (int i = 0; i < length_; ++i)
+        for (int i = dstart_; i < dend_; ++i)
             data_[i] = data_[i]*v_vv - other.data_[i]*u_vv;
 {% else %}
 {% for i in range(1, numDerivs+1) %}

opm/material/densead/Evaluation.hpp

@@ -161,8 +161,10 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
+
+        for (int i = dstart_; i < dend_; ++i)
             data_[i] = other.data_[i];
+
     }
 
 
@@ -219,7 +221,7 @@ public:
 
         //  derivatives
 
-        for (int i = 0; i < length_; ++i)
+        for (int i = dstart_; i < dend_; ++i)
             this->data_[i] = this->data_[i]*v + other.data_[i] * u;
 
 
@@ -250,7 +252,7 @@ public:
 
         //  derivatives
 
-        for (int i = 0; i < length_; ++i)
+        for (int i = dstart_; i < dend_; ++i)
             data_[i] = data_[i]*v_vv - other.data_[i]*u_vv;
 
 

opm/material/densead/Evaluation1.hpp

@@ -159,8 +159,10 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        data_[1] = other.data_[1];
+
     }
 
 

opm/material/densead/Evaluation10.hpp

@@ -177,8 +177,19 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

opm/material/densead/Evaluation11.hpp

@@ -179,8 +179,20 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

opm/material/densead/Evaluation12.hpp

@@ -181,8 +181,21 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

opm/material/densead/Evaluation2.hpp

@@ -161,8 +161,11 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        data_[1] = other.data_[1];
+        data_[2] = other.data_[2];
+
     }
 
 

opm/material/densead/Evaluation3.hpp

@@ -163,8 +163,12 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        data_[1] = other.data_[1];
+        data_[2] = other.data_[2];
+        data_[3] = other.data_[3];
+
     }
 
 

opm/material/densead/Evaluation4.hpp

@@ -165,8 +165,13 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        data_[1] = other.data_[1];
+        data_[2] = other.data_[2];
+        data_[3] = other.data_[3];
+        data_[4] = other.data_[4];
+
     }
 
 

opm/material/densead/Evaluation5.hpp

@@ -167,8 +167,14 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

opm/material/densead/Evaluation6.hpp

@@ -169,8 +169,15 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

opm/material/densead/Evaluation7.hpp

@@ -171,8 +171,16 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

opm/material/densead/Evaluation8.hpp

@@ -173,8 +173,17 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

opm/material/densead/Evaluation9.hpp

@@ -175,8 +175,18 @@ public:
     // copy all derivatives from other
     void copyDerivatives(const Evaluation& other)
     {
-        for (int i = dstart_; 0 < dend_; ++i)
-            data_[i] = other.data_[i];
+
+
+        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];
+
     }
 
 

tests/test_densead.cpp

@@ -647,31 +647,15 @@ inline void testAll()
 
 };//TestEnv
 
-template <class Scalar, int numVars>
-struct TestAll
-{
-    static void test()
-    {
-        TestEnv< Scalar, numVars >().testAll();
-        TestAll< Scalar, numVars-1>::test();
-    }
-};
-
-template <class Scalar>
-struct TestAll<Scalar, 2>
-{
-    static void test()
-    {
-        TestEnv< Scalar, 2 >().testAll();
-    }
-};
 
 int main(int argc, char **argv)
 {
     Dune::MPIHelper::instance(argc, argv);
 
-    TestAll<double, 15>::test();
-    TestAll<float, 15>::test();
+    TestEnv<double, 15>().testAll();
+    TestEnv<double, 2>().testAll();
+    TestEnv<float, 15>().testAll();
+    TestEnv<float, 2>().testAll();
 
     return 0;
 }