Changeset 12493 for issm/trunk-jpl/src/c/objects/Elements/PentaRef.cpp

Timestamp:

06/21/12 10:02:29 (13 years ago)

Author:

Mathieu Morlighem

Message:

replaced all _error_ to _error2_

File:

• issm/trunk-jpl/src/c/objects/Elements/PentaRef.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/objects/Elements/PentaRef.cpp

@@ -949 +949 @@
         /*Get Determinant*/
         Matrix3x3Determinant(Jdet,&J[0][0]);
-        if(*Jdet<0) _error_("negative jacobian determinant!");
+        if(*Jdet<0) _error2_("negative jacobian determinant!");
 
 }
@@ -972 +972 @@
         /*Jdet = norm( AB ^ AC ) / (2 * area of the reference triangle), with areaRef=sqrt(3) */
         *Jdet=SQRT3/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) _error_("negative jacobian determinant!");
+        if(*Jdet<0) _error2_("negative jacobian determinant!");
 }
 /*}}}*/
@@ -990 +990 @@
 
         *Jdet=1.0/2.0*sqrt(pow(x2-x1,2.) + pow(y2-y1,2.) + pow(z2-z1,2.));
-        if(*Jdet<0) _error_("negative jacobian determinant!");
+        if(*Jdet<0) _error2_("negative jacobian determinant!");
 
 }
@@ -1226 +1226 @@
         /*Area of a trabezoid = altitude * (base1 + base2)/2 */
         *Jdet= pow(pow(x2-x1,2.) + pow(y2-y1,2.),0.5) * (z4-z1 + z3-z2)/8;
-        if(*Jdet<0) _error_("negative jacobian determinant!");
+        if(*Jdet<0) _error2_("negative jacobian determinant!");
 
 }