Changeset 12878 for issm/branches/trunk-jpl-damage/src/c/Container/Observations.h

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/c/Container/Observations.h (modified) (2 diffs)

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

@@ -6 +6 @@
 #define  _CONTAINER_OBSERVATIONS_H_
 
-class Obsevration;
+#include "../include/include.h"
+
 class Quadtree;
+class Variogram;
 class Options;
 
@@ -19 +21 @@
                 /*constructors, destructors*/
                 Observations();
-                Observations(double* observations_list,double* x,double* y,int n,Options* options);
+                Observations(IssmDouble* observations_list,IssmDouble* x,IssmDouble* y,int n,Options* options);
                 ~Observations();
 
                 /*Methods*/
-                void ObservationList(double **px,double **py,double **pobs,int* pnobs,double x_interp,double y_interp,double range);
-                void QuadtreeColoring(double* A,double *x,double *y,int n);
-                void Variomap(double* gamma,double *x,int n);
+                void ClosestObservation(IssmDouble *px,IssmDouble *py,IssmDouble *pobs,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius);
+                void InterpolationIDW(IssmDouble *pprediction,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius,int mindata,int maxdata,IssmDouble power);
+                void InterpolationKriging(IssmDouble *pprediction,IssmDouble *perror,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius,int mindata,int maxdata,Variogram* variogram);
+                void InterpolationNearestNeighbor(IssmDouble *pprediction,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius);
+                void ObservationList(IssmDouble **px,IssmDouble **py,IssmDouble **pobs,int* pnobs);
+                void ObservationList(IssmDouble **px,IssmDouble **py,IssmDouble **pobs,int* pnobs,IssmDouble x_interp,IssmDouble y_interp,IssmDouble radius,int maxdata);
+                void QuadtreeColoring(IssmDouble* A,IssmDouble *x,IssmDouble *y,int n);
+                void Variomap(IssmDouble* gamma,IssmDouble *x,int n);
 
 };