Changeset 17342

Timestamp:

02/22/14 13:03:54 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: error is now identical to gslib

File:

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

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

@@ -380 +380 @@
         IssmPDouble* B = xNew<IssmPDouble>(n_obs+1);
 
+        IssmDouble unbias = variogram->Covariance(0.,0.);
         /*First: Create semivariogram matrix for observations*/
         for(i=0;i<n_obs;i++){
@@ -386 +387 @@
                         A[j*(n_obs+1)+i] = A[i*(n_obs+1)+j];
                 }
-                A[i*(n_obs+1)+n_obs] = 1.;
-        }
-        for(i=0;i<n_obs;i++) A[n_obs*(n_obs+1)+i]=1.;
+                A[i*(n_obs+1)+n_obs] = unbias;
+                //A[i*(n_obs+1)+n_obs] = 1.;
+        }
+        for(i=0;i<n_obs;i++) A[n_obs*(n_obs+1)+i]=unbias;
+        //for(i=0;i<n_obs;i++) A[n_obs*(n_obs+1)+i]=1.;
         A[n_obs*(n_obs+1)+n_obs] = 0.;
 
         /*Get semivariogram vector associated to this location*/
         for(i=0;i<n_obs;i++) B[i] = variogram->Covariance(x[i]-x_interp,y[i]-y_interp);
-        B[n_obs] = 1.;
+        B[n_obs] = unbias;
+        //B[n_obs] = 1.;
 
         /*Solve the three linear systems*/