From d52f3c8dac9bd2d80f9ebb31d3abbb9c3722311a Mon Sep 17 00:00:00 2001
From: Gauthier Becker <gauthierbecker@gmail.com>
Date: Tue, 21 Jun 2011 10:35:06 +0000
Subject: [PATCH] Fix bug with STensor43 (index 77 appears twice and no index
78...)
---
Solver/STensor43.h | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/Solver/STensor43.h b/Solver/STensor43.h
index dd461ed8b6..906f7451f5 100644
--- a/Solver/STensor43.h
+++ b/Solver/STensor43.h
@@ -10,14 +10,14 @@
class STensor43 {
protected:
- // 0000 0001 0002 0010 ... 2211 2212 2220 2221 2222
+ // 0000 0001 0002 0010 ... 2211 2212 2220 2221 2222
double _val[81];
public:
inline int getIndex(int i, int j, int k, int l) const
{
static int _index[3][3][3][3] = {{{{0,1,2},{3,4,5},{6,7,8}},{{9,10,11},{12,13,14},{15,16,17}},{{18,19,20},{21,22,23},{24,25,26}}},
{{{27,28,29},{30,31,32},{33,34,35}},{{36,37,38},{39,40,41},{42,43,44}},{{45,46,47},{48,49,50},{51,52,53}}},
- {{{54,55,56},{57,58,59},{60,61,62}},{{63,64,65},{66,67,68},{69,70,71}},{{72,73,74},{75,76,77},{77,79,80}}}};
+ {{{54,55,56},{57,58,59},{60,61,62}},{{63,64,65},{66,67,68},{69,70,71}},{{72,73,74},{75,76,77},{78,79,80}}}};
return _index[i][j][k][l];
}
STensor43(const STensor43& other)
@@ -33,7 +33,7 @@ class STensor43 {
for (int l = 0; l < 3; l++)
if ((i==k)&&(j==l))
_val[getIndex(i, j, k, l)]=v;
- else
+ else
_val[getIndex(i, j, k, l)]=0.0;
}
inline double &operator()(int i, int j,int k, int l)
@@ -43,7 +43,7 @@ class STensor43 {
inline double operator()(int i, int j, int k, int l) const
{
return _val[getIndex(i, j, k ,l)];
- }
+ }
STensor43 operator + (const STensor43 &other) const
{
STensor43 res(*this);
@@ -55,12 +55,12 @@ class STensor43 {
for (int i = 0; i < 81; i++) _val[i] += other._val[i];
return *this;
}
- STensor43& operator *= (const double &other)
+ STensor43& operator *= (const double &other)
{
for (int i = 0; i < 81; i++) _val[i] *= other;
return *this;
}
-/* STensor43& operator *= (const STensor43 &other)
+/* STensor43& operator *= (const STensor43 &other)
{
// to be implemented
return *this;
@@ -70,7 +70,7 @@ class STensor43 {
// tensor product
inline void tensprod(const STensor3 &a, const STensor3 &b, STensor43 &c)
-{
+{
for (int i = 0; i < 3; i++)
for (int j = 0; j < 3; j++)
for (int k = 0; k < 3; k++)
@@ -79,8 +79,8 @@ inline void tensprod(const STensor3 &a, const STensor3 &b, STensor43 &c)
}
inline double dot(const STensor43 &a, const STensor43 &b)
-{
- double prod=0;
+{
+ double prod=0;
for (int i = 0; i < 3; i++)
for (int j = 0; j < 3; j++)
for (int k = 0; k < 3; k++)
@@ -90,21 +90,21 @@ inline double dot(const STensor43 &a, const STensor43 &b)
}
inline STensor43 operator*(const STensor43 &t, double m)
-{
+{
STensor43 val(t);
val *= m;
return val;
}
inline STensor43 operator*(double m,const STensor43 &t)
-{
+{
STensor43 val(t);
val *= m;
return val;
}
inline STensor3 operator*(const STensor43 &t, const STensor3 &m)
-{
+{
STensor3 val(0.);
for (int i = 0; i < 3; i++)
for (int j = 0; j < 3; j++)
@@ -115,7 +115,7 @@ inline STensor3 operator*(const STensor43 &t, const STensor3 &m)
}
inline STensor3 operator*( const STensor3 &m , const STensor43 &t)
-{
+{
STensor3 val(0.);
for (int i = 0; i < 3; i++)
for (int j = 0; j < 3; j++)
--
GitLab