Changeset 376

Timestamp:

Mar 25, 2006 9:15:15 AM (18 years ago)

Author:

mmc

Message:

Took out hacks added for the det=0 case. If det=0, it means that
the mesh is bad, and the problem should be fixed at another level.

File:

• trunk/src2/core/RpMeshTri2D.cc (modified) (4 diffs)

trunk/src2/core/RpMeshTri2D.cc

@@ -112 +112 @@
     double det = x2*y3-x3*y2;
 
-    if (det != 0.0) {
-        phi[1] = (xr*y3 - x3*yr)/det;
-        phi[2] = (x2*yr - xr*y2)/det;
-        phi[0] = 1.0-phi[1]-phi[2];
-    } else {
-        phi[1] = NAN;
-        phi[2] = NAN;
-        phi[0] = NAN;
-    }
+    phi[1] = (xr*y3 - x3*yr)/det;
+    phi[2] = (x2*yr - xr*y2)/det;
+    phi[0] = 1.0-phi[1]-phi[2];
 }
 
@@ -347 +341 @@
     }
 
-    int lastCellId = -1;
     while (!cell.isNull()) {
         double phi[3];
@@ -354 +347 @@
         // if all are >= 0, then this tri contains node
         cell.barycentrics(node, phi);
-        if (isnan(phi[0])) {
-            cell.clear();
-            return cell;
-        }
         if (phi[0] >= 0.0 && phi[1] >= 0.0 && phi[2] >= 0.0) {
             break;
@@ -372 +361 @@
         Tri2D& tri = nonconst->_celllist[ cell.cellId() ];
         int neighborId = tri.neighbors[dir];
-        if (neighborId < 0 || neighborId == lastCellId) {
-if (neighborId == lastCellId) {
-std::cout << "loop at " << lastCellId << "->" << neighborId << std::endl;
-}
+        if (neighborId < 0) {
             cell.clear();
             return cell;
         }
 
-        lastCellId = cell.cellId();
         Tri2D& tri2 = nonconst->_celllist[neighborId];
         Node2D *n1Ptr = &nonconst->_nodelist[tri2.nodes[0]];