Changeset 14240

Timestamp:

01/11/13 14:40:35 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: improved sensitivity with respect to edges

File:

• issm/trunk-jpl/src/c/Container/Observations.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/Container/Observations.cpp

@@ -125 +125 @@
         /*Output and Intermediaries*/
         int          nobs,i,index;
-        IssmPDouble  h2,hmin2,radius2;
+        IssmPDouble  hmin,h2,hmin2,radius2;
         int         *indices      = NULL;
         Observation *observation  = NULL;
@@ -133 +133 @@
         _assert_(index>=0);
         observation=dynamic_cast<Observation*>(this->GetObjectByOffset(index));
-        hmin2 = (observation->x-x_interp)*(observation->x-x_interp) + (observation->y-y_interp)*(observation->y-y_interp);
+        hmin = sqrt((observation->x-x_interp)*(observation->x-x_interp) + (observation->y-y_interp)*(observation->y-y_interp));
 
         /*Compute radius square*/
-        if(radius==0) radius=this->quadtree->root->length;
+        if(radius==0 || hmin<radius){
+                radius=hmin;
+        }
         radius2 = radius*radius;
-        if(hmin2<radius2){
-                radius =sqrt(hmin2);
-                radius2=hmin2;
-        }
 
         /*Find all observations that are in radius*/