[cig-commits] r8915 - cs/benchmark/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2007-12-19 12:02:19 -0800 (Wed, 19 Dec 2007)
New Revision: 8915

Modified:
   cs/benchmark/cigma/trunk/src/Hex.cpp
Log:
Changes to Hex.cpp
 * Missed a reference vertex!
 * More spacing in hex_grad_shape(), for readability

Modified: cs/benchmark/cigma/trunk/src/Hex.cpp
===================================================================
--- cs/benchmark/cigma/trunk/src/Hex.cpp	2007-12-19 20:02:06 UTC (rev 8914)
+++ cs/benchmark/cigma/trunk/src/Hex.cpp	2007-12-19 20:02:19 UTC (rev 8915)
@@ -17,37 +17,37 @@
 {
     #define S(i,j) s[3*(i) + (j)]
 
-    S(0,0) = -0.125 * (1.-v) * (1.-w);
-    S(0,1) = -0.125 * (1.-u) * (1.-w);
-    S(0,2) = -0.125 * (1.-u) * (1.-v);
+    S(0,0) = -0.125 * (1.0 - v) * (1.0 - w);
+    S(0,1) = -0.125 * (1.0 - u) * (1.0 - w);
+    S(0,2) = -0.125 * (1.0 - u) * (1.0 - v);
 
-    S(1,0) =  0.125 * (1.-v) * (1.-w);
-    S(1,1) = -0.125 * (1.+u) * (1.-w);
-    S(1,2) = -0.125 * (1.+u) * (1.-v);
+    S(1,0) =  0.125 * (1.0 - v) * (1.0 - w);
+    S(1,1) = -0.125 * (1.0 + u) * (1.0 - w);
+    S(1,2) = -0.125 * (1.0 + u) * (1.0 - v);
 
-    S(2,0) =  0.125 * (1.+v) * (1.-w);
-    S(2,1) =  0.125 * (1.+u) * (1.-w);
-    S(2,2) = -0.125 * (1.+u) * (1.+v);
+    S(2,0) =  0.125 * (1.0 + v) * (1.0 - w);
+    S(2,1) =  0.125 * (1.0 + u) * (1.0 - w);
+    S(2,2) = -0.125 * (1.0 + u) * (1.0 + v);
 
-    S(3,0) = -0.125 * (1.+v) * (1.-w);
-    S(3,1) =  0.125 * (1.-u) * (1.-w);
-    S(3,2) = -0.125 * (1.-u) * (1.+v);
+    S(3,0) = -0.125 * (1.0 + v) * (1.0 - w);
+    S(3,1) =  0.125 * (1.0 - u) * (1.0 - w);
+    S(3,2) = -0.125 * (1.0 - u) * (1.0 + v);
 
-    S(4,0) = -0.125 * (1.-v) * (1.+w);
-    S(4,1) = -0.125 * (1.-u) * (1.+w);
-    S(4,2) =  0.125 * (1.-u) * (1.-v);
+    S(4,0) = -0.125 * (1.0 - v) * (1.0 + w);
+    S(4,1) = -0.125 * (1.0 - u) * (1.0 + w);
+    S(4,2) =  0.125 * (1.0 - u) * (1.0 - v);
 
-    S(5,0) =  0.125 * (1.-v) * (1.+w);
-    S(5,1) = -0.125 * (1.+u) * (1.+w);
-    S(5,2) =  0.125 * (1.+u) * (1.-v);
+    S(5,0) =  0.125 * (1.0 - v) * (1.0 + w);
+    S(5,1) = -0.125 * (1.0 + u) * (1.0 + w);
+    S(5,2) =  0.125 * (1.0 + u) * (1.0 - v);
 
-    S(6,0) =  0.125 * (1.+v) * (1.+w);
-    S(6,1) =  0.125 * (1.+u) * (1.+w);
-    S(6,2) =  0.125 * (1.+u) * (1.+v);
+    S(6,0) =  0.125 * (1.0 + v) * (1.0 + w);
+    S(6,1) =  0.125 * (1.0 + u) * (1.0 + w);
+    S(6,2) =  0.125 * (1.0 + u) * (1.0 + v);
 
-    S(7,0) = -0.125 * (1.+v) * (1.+w);
-    S(7,1) =  0.125 * (1.-u) * (1.+w);
-    S(7,2) =  0.125 * (1.-u) * (1.+v);
+    S(7,0) = -0.125 * (1.0 + v) * (1.0 + w);
+    S(7,1) =  0.125 * (1.0 - u) * (1.0 + w);
+    S(7,2) =  0.125 * (1.0 - u) * (1.0 + v);
 
     #undef S
 }
@@ -63,6 +63,7 @@
         +1.0, +1.0, -1.0,
         -1.0, +1.0, -1.0,
         -1.0, -1.0, +1.0,
+        +1.0, -1.0, +1.0,
         +1.0, +1.0, +1.0,
         -1.0, +1.0, +1.0
     };