Changeset 14226

Timestamp:

01/10/13 07:57:58 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: Added distance output

Location:

issm/trunk-jpl/src/c

Files:

• Container/Observations.cpp (modified) (1 diff)
• Container/Observations.h (modified) (1 diff)
• modules/Krigingx/Krigingx.cpp (modified) (1 diff)

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

@@ -167 +167 @@
         xDelete<int>(indices);
 
+}/*}}}*/
+/*FUNCTION Observations::Distances{{{*/
+void Observations::Distances(IssmPDouble* distances,IssmPDouble *x,IssmPDouble *y,int n,IssmPDouble radius){
+
+        IssmPDouble xi,yi,obs;
+
+        for(int i=0;i<n;i++){
+                this->ClosestObservation(&xi,&yi,&obs,x[i],y[i],radius);
+                distances[i]=sqrt( (x[i]-xi)*(x[i]-xi) + (y[i]-yi)*(y[i]-yi) );
+        }
 }/*}}}*/
 /*FUNCTION Observations::ObservationList(IssmPDouble **px,IssmPDouble **py,IssmPDouble **pobs,int* pnobs,IssmPDouble x_interp,IssmPDouble y_interp,IssmPDouble radius,int maxdata){{{*/

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

@@ -27 +27 @@
                 /*Methods*/
                 void ClosestObservation(IssmDouble *px,IssmDouble *py,IssmDouble *pobs,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius);
+                void Distances(IssmPDouble* distances,IssmPDouble *x,IssmPDouble *y,int n,IssmPDouble radius);
                 void InterpolationIDW(IssmDouble *pprediction,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius,int mindata,int maxdata,IssmDouble power);
                 void InterpolationV4(IssmDouble *pprediction,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius,int mindata,int maxdata);

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

@@ -57 +57 @@
         else if(strcmp(output,"variomap")==0){
                 observations->Variomap(predictions,x_interp,n_interp);
+        }
+        else if(strcmp(output,"distance")==0){
+                observations->Distances(predictions,x_interp,y_interp,n_interp,radius);
         }
         else if(strcmp(output,"delaunay")==0){