Rev | Line | |
---|
[17802] | 1 | Index: ../trunk-jpl/src/c/classes/kriging/Observations.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/classes/kriging/Observations.cpp (revision 17341)
|
---|
| 4 | +++ ../trunk-jpl/src/c/classes/kriging/Observations.cpp (revision 17342)
|
---|
| 5 | @@ -379,20 +379,24 @@
|
---|
| 6 | IssmPDouble* A = xNew<IssmPDouble>((n_obs+1)*(n_obs+1));
|
---|
| 7 | IssmPDouble* B = xNew<IssmPDouble>(n_obs+1);
|
---|
| 8 |
|
---|
| 9 | + IssmDouble unbias = variogram->Covariance(0.,0.);
|
---|
| 10 | /*First: Create semivariogram matrix for observations*/
|
---|
| 11 | for(i=0;i<n_obs;i++){
|
---|
| 12 | for(j=0;j<=i;j++){
|
---|
| 13 | A[i*(n_obs+1)+j] = variogram->Covariance(x[i]-x[j],y[i]-y[j]);
|
---|
| 14 | A[j*(n_obs+1)+i] = A[i*(n_obs+1)+j];
|
---|
| 15 | }
|
---|
| 16 | - A[i*(n_obs+1)+n_obs] = 1.;
|
---|
| 17 | + A[i*(n_obs+1)+n_obs] = unbias;
|
---|
| 18 | + //A[i*(n_obs+1)+n_obs] = 1.;
|
---|
| 19 | }
|
---|
| 20 | - for(i=0;i<n_obs;i++) A[n_obs*(n_obs+1)+i]=1.;
|
---|
| 21 | + for(i=0;i<n_obs;i++) A[n_obs*(n_obs+1)+i]=unbias;
|
---|
| 22 | + //for(i=0;i<n_obs;i++) A[n_obs*(n_obs+1)+i]=1.;
|
---|
| 23 | A[n_obs*(n_obs+1)+n_obs] = 0.;
|
---|
| 24 |
|
---|
| 25 | /*Get semivariogram vector associated to this location*/
|
---|
| 26 | for(i=0;i<n_obs;i++) B[i] = variogram->Covariance(x[i]-x_interp,y[i]-y_interp);
|
---|
| 27 | - B[n_obs] = 1.;
|
---|
| 28 | + B[n_obs] = unbias;
|
---|
| 29 | + //B[n_obs] = 1.;
|
---|
| 30 |
|
---|
| 31 | /*Solve the three linear systems*/
|
---|
| 32 | #if _HAVE_GSL_
|
---|
Note:
See
TracBrowser
for help on using the repository browser.