Changeset 11684 for issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Mesh.cpp

Timestamp:

03/12/12 14:40:42 (13 years ago)

Author:

cborstad

Message:

merged revisions 11428:11680 from trunk-jpl into branches/trunk-jpl-damage

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/objects/Bamg/Mesh.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/c/objects/Bamg/Mesh.cpp

@@ -1028 +1028 @@
                                 Triangle &t=triangles[i];
                                 if (t.det>0 && !(t.Hidden(0)||t.Hidden(1) || t.Hidden(2) )){
-                                        index[num*3+0]=GetId(t[0])+1; //back to M indexing
-                                        index[num*3+1]=GetId(t[1])+1; //back to M indexing
-                                        index[num*3+2]=GetId(t[2])+1; //back to M indexing
-                                        num=num+1;
+                                        if(t.Anisotropy()<2 & t.Length()<1.e+5){
+                                                index[num*3+0]=GetId(t[0])+1; //back to M indexing
+                                                index[num*3+1]=GetId(t[1])+1; //back to M indexing
+                                                index[num*3+2]=GetId(t[2])+1; //back to M indexing
+                                                num=num+1;
+                                        }
                                 }
                         }
@@ -1038 +1040 @@
                 /*Assign output pointers*/
                 *pindex=index;
-                *pnels=k;
+                *pnels=num;
         }
         /*}}}1*/