Changeset 12229 for issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp

Timestamp:

05/10/12 10:41:54 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added 2 options: boxlength and searchrange

File:

• issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/modules/Krigingx/Krigingx.cpp

@@ -23 +23 @@
         /*Intermediaries*/
         int           i,j,n_obs;
+        double        range;
         double        numerator,denominator,ratio;
         double       *x            = NULL;
@@ -33 +34 @@
         double       *gamma0       = NULL;
         double       *ones         = NULL;
+        char         *output       = NULL;
         Variogram    *variogram    = NULL;
         Observations *observations = NULL;
@@ -38 +40 @@
         /*Get Variogram from Options*/
         ProcessVariogram(&variogram,options);
+        options->Get(&range,"searchrange",0.);
 
         /*Process observation dataset*/
@@ -44 +47 @@
         /*Allocation output*/
         predictions =(double*)xmalloc(n_interp*sizeof(double));
+        for(i=0;i<n_interp;i++) predictions[i]=0;
 
-        for(i=0;i<n_interp;i++) predictions[i]=0;
-        observations->QuadtreeColoring(predictions,x_interp,y_interp,n_interp);
-        *ppredictions=predictions;
-        return 1;
+        /*Get output*/
+        options->Get(&output,"output","quadtree");
+
+        if(strcmp(output,"quadtree")==0){
+                observations->QuadtreeColoring(predictions,x_interp,y_interp,n_interp);
+                *ppredictions=predictions;
+                return 1;
+        }
 
         /*Loop over all interpolations*/
@@ -56 +64 @@
 
                 /*Get list of observations for current point*/
-                observations->ObservationList(&x,&y,&obs,&n_obs,x_interp[idx],y_interp[idx]);
+                observations->ObservationList(&x,&y,&obs,&n_obs,x_interp[idx],y_interp[idx],range);
 
                 /*Allocate intermediary matrix and vectors*/
@@ -105 +113 @@
         delete variogram;
         delete observations;
+        xfree((void**)&output);
         *ppredictions=predictions;
         return 1;