Changeset 23094

Timestamp:

08/16/18 14:54:38 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG:: fixing distance calculation

Location:

issm/trunk-jpl

Files:

• src/c/classes/FemModel.cpp (modified) (1 diff)
• test/NightlyRun/test808.m (modified) (1 diff)
• test/NightlyRun/test808.py (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1070 +1070 @@
 
                         /*Skip if tip is more than 10xdmin away*/
-                        if(fabs(allsegmentlist[4*i+0] - x)>10*dmin) continue;
-                        if(fabs(allsegmentlist[4*i+0] - y)>10*dmin) continue;
+                        if(pow(allsegmentlist[4*i+0] - x,2)>10*dmin) continue;
+                        if(pow(allsegmentlist[4*i+1] - y,2)>10*dmin) continue;
 
                         IssmDouble l2 = (allsegmentlist[4*i+2]-allsegmentlist[4*i+0])*(allsegmentlist[4*i+2]-allsegmentlist[4*i+0]) + (allsegmentlist[4*i+3]-allsegmentlist[4*i+1])*(allsegmentlist[4*i+3]-allsegmentlist[4*i+1]);

issm/trunk-jpl/test/NightlyRun/test808.m

@@ -14 +14 @@
 
 md.timestepping.time_step=1;
-md.timestepping.final_time=30;
+md.timestepping.final_time=3;
 
 %Transient

issm/trunk-jpl/test/NightlyRun/test808.py

@@ -24 +24 @@
 
 md.timestepping.time_step = 1
-md.timestepping.final_time = 30
+md.timestepping.final_time = 3
 
 #Transient