OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evaluation: update the generated code

Browse Source
This commit is contained in:
Andreas Lauser
2017-07-27 16:26:51 +02:00
parent 8a0de34ad0
commit 6cdae5f4c2
13 changed files with 26 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
opm/material/densead/Evaluation.hpp
View File

@@ -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

14
opm/material/densead/Evaluation1.hpp
View File

@@ -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

32
opm/material/densead/Evaluation10.hpp
View File

@@ -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

34
opm/material/densead/Evaluation11.hpp
View File

@@ -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

36
opm/material/densead/Evaluation12.hpp
View File

@@ -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

16
opm/material/densead/Evaluation2.hpp
View File

@@ -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

18
opm/material/densead/Evaluation3.hpp
View File

@@ -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

20
opm/material/densead/Evaluation4.hpp
View File

@@ -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

22
opm/material/densead/Evaluation5.hpp
View File

@@ -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

24
opm/material/densead/Evaluation6.hpp
View File

@@ -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

26
opm/material/densead/Evaluation7.hpp
View File

@@ -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

28
opm/material/densead/Evaluation8.hpp
View File

@@ -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

30
opm/material/densead/Evaluation9.hpp
View File

@@ -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