Changeset 336

Timestamp:

05/11/09 14:58:33 (16 years ago)

Author:

seroussi

Message:

new determinant in 2d

File:

• issm/trunk/src/c/objects/Tria.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Tria.cpp

@@ -1007 +1007 @@
          * J is assumed to have been allocated of size NDOF2xNDOF2.*/
 
-        double x1,x2,x3,y1,y2,y3;
+        double x1,x2,x3,y1,y2,y3,z1,z2,z3;
         
         x1=*(xyz_list+3*0+0);
         y1=*(xyz_list+3*0+1);
+        z1=*(xyz_list+3*0+2);
         x2=*(xyz_list+3*1+0);
         y2=*(xyz_list+3*1+1);
+        z2=*(xyz_list+3*1+2);
         x3=*(xyz_list+3*2+0);
         y3=*(xyz_list+3*2+1);
-
-
-        *Jdet=sqrt(3.0)/6.0*((x2-x1)*(y3-y1)-(x3-x1)*(y2-y1));
+        z3=*(xyz_list+3*2+2);
+
+
+        *Jdet=sqrt(3.0)/6.0*pow(pow(((y2-y1)*(z3-z1)-(z2-z1)*(y3-y1)),2.0)+pow(((z2-z1)*(x3-x1)-(x2-x1)*(z3-z1)),2.0)+pow(((x2-x1)*(y3-y1)-(y2-y1)*(x3-x1)),2.0),0.5);
+
 
         if(Jdet<0){