Changeset 17327

Timestamp:

02/20/14 19:58:45 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing number of observations in case

File:

• issm/trunk-jpl/src/c/classes/kriging/Observations.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/kriging/Observations.cpp

@@ -202 +202 @@
 
         /*If radius is not provided or is 0, return all observations*/
-        if(radius==0.) radius=this->quadtree->root->length;
+        if(radius==0.) radius=this->quadtree->root->length*2.;
 
         /*Compute radius square*/
@@ -466 +466 @@
         _assert_(pprediction);
 
-        /*If radius is not provided or is 0, return all observations*/
-        if(radius==0) radius=this->quadtree->root->length;
-
         /*Get list of observations for current point*/
         this->ObservationList(&x,&y,&obs,&n_obs,x_interp,y_interp,radius,maxdata);
@@ -505 +502 @@
                                 Green[i*n_obs+j] = Green[j*n_obs+i];
                         }
+                        /*Zero diagonal (should be done already, but just in case)*/
+                        Green[i*n_obs+i] = 0.;
                 }