Changeset 21314

Timestamp:

10/26/16 11:01:48 (8 years ago)

Author:

Mathieu Morlighem

Message:

BUG: was not working properly when the exp file has multiple contours'

Location:

issm/trunk-jpl/src/c/modules/ExpToLevelSetx

Files:

• ExpToLevelSetx.cpp (modified) (2 diffs)
• ExpToLevelSetxt.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/ExpToLevelSetx/ExpToLevelSetx.cpp

@@ -17 +17 @@
         /*output: */
         double*  distance;
-        distance   = xNewZeroInit<double>(nods);
+        distance = xNew<double>(nods);
+        for(int i=0;i<nods;i++) distance[i]=1e50;
 
         /*initialize thread parameters: */
@@ -23 +24 @@
         gate.contours  = contours;
         gate.nods      = nods;
-        gate.distance    = distance;
+        gate.distance  = distance;
         gate.x         = x;
         gate.y         = y;

issm/trunk-jpl/src/c/modules/ExpToLevelSetx/ExpToLevelSetxt.cpp

@@ -58 +58 @@
 
                 /*Figure out distance from (x0,y0) to contour: */
-                mind=INFINITY;
+                mind=1e+50;
                 for (j=0;j<contournods-1;j++){
                         x1=contourx[j]; y1=contoury[j];
@@ -64 +64 @@
                         mind=min(mind,minimum_distance(x1,y1,x2,y2,x0,y0));
                 }
-                dist[i]=mind;
+                dist[i]=min(dist[i],mind);
         }