Changeset 12184

Timestamp:

05/03/12 09:55:05 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added options

File:

• issm/trunk-jpl/src/modules/Kriging/Kriging.cpp (modified) (3 diffs)

issm/trunk-jpl/src/modules/Kriging/Kriging.cpp

@@ -7 +7 @@
 
         /*Outputs*/
-        double *x            = NULL;
-        double *y            = NULL;
-        double *observations = NULL;
-        double *x_interp     = NULL;
-        double *y_interp     = NULL;
-        double *predictions  = NULL;
-        int     n_interp,n,n_obs;
+        double  *x            = NULL;
+        double  *y            = NULL;
+        double  *observations = NULL;
+        double  *x_interp     = NULL;
+        double  *y_interp     = NULL;
+        double  *predictions  = NULL;
+        Options *options      = NULL;
+        int      n_interp,n,n_obs;
 
         /*Boot module: */
@@ -19 +20 @@
 
         /*checks on arguments on the matlab side: */
-        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&KrigingUsage);
+        if (nrhs<NRHS || nlhs!=NLHS){
+                KrigingUsage(); _error_("Kriging usage error");
+        }
 
         /*Fetch inputs: */
@@ -27 +30 @@
         FetchData(&x_interp,&n_interp,XINTERP);
         FetchData(&y_interp,&n,YINTERP);          if(n_interp!=n) _error_("x_interp and y_interp should have the same size");
+        FetchData(&options,NRHS,nrhs,prhs);
 
         /*Call x layer*/
-        Krigingx(&predictions,x,y,observations,n_obs,x_interp,y_interp,n_interp);
+        Krigingx(&predictions,x,y,observations,n_obs,x_interp,y_interp,n_interp,options);
 
         /*Generate output Matlab Structures*/