Changeset 12878 for issm/branches/trunk-jpl-damage/src/modules/Kriging/Kriging.cpp

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/modules/Kriging/Kriging.cpp (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/modules/Kriging/Kriging.cpp ¶

@@ -22 +22 @@
         /*checks on arguments on the matlab side: */
         if (nrhs<NRHS || nlhs>NLHS){
-                KrigingUsage(); _error_("Kriging usage error");
+                KrigingUsage(); _error2_("Kriging usage error");
         }
 
         /*Fetch inputs: */
         FetchData(&x,&n_obs,X);
-        FetchData(&y,&N,Y);                       if(n_obs!=N) _error_("x and y should have the same size");
-        FetchData(&observations,&N,OBSERVATIONS); if(n_obs!=N) _error_("x and observations should have the same size");
+        FetchData(&y,&N,Y);                       if(n_obs!=N) _error2_("x and y should have the same size");
+        FetchData(&observations,&N,OBSERVATIONS); if(n_obs!=N) _error2_("x and observations should have the same size");
         FetchData(&x_interp,&M_interp,&N_interp,XINTERP);
-        FetchData(&y_interp,&M,&N,YINTERP);       if(N!=N_interp || M!=M_interp) _error_("x_interp and y_interp should have the same size");
+        FetchData(&y_interp,&M,&N,YINTERP);       if(N!=N_interp || M!=M_interp) _error2_("x_interp and y_interp should have the same size");
         FetchData(&options,NRHS,nrhs,prhs);
 
@@ -54 +54 @@
 
 void KrigingUsage(void){
-        _printf_(true,"\n");
-        _printf_(true,"   usage: predictions=%s(x,y,observations,x_interp,y_interp);\n",__FUNCT__);
-        _printf_(true,"\n");
+        _pprintLine_("");
+        _pprintLine_("   usage: predictions=" << __FUNCT__ << "(x,y,observations,x_interp,y_interp,'options');");
+        _pprintLine_("   available options:");
+        _pprintLine_("      -'model': Available variogram models 'gaussian' (default),'spherical','power','exponential'");
+        _pprintLine_("         -'nugget': nugget effect (default 0.2)");
+        _pprintLine_("         -'range':  for gaussian, spherical and exponential models (default sqrt(3))");
+        _pprintLine_("         -'sill':   for gaussian, spherical and exponential models (default 1)");
+        _pprintLine_("         -'slope':  for power model (default 1)");
+        _pprintLine_("         -'power':  for power model (default 1)");
+        _pprintLine_("      -'searchradius': search radius for each prediction (default is observations span)");
+        _pprintLine_("      -'boxlength':    minimum length of quadtree boxes (useful to decrease the number of observations)");
+        _pprintLine_("      -'maxdata':      minimum number of observations for a prediction (default is 50)");
+        _pprintLine_("      -'mindata':      maximum number of observations for a prediction (default is 1)");
+        _pprintLine_("      -'maxtrimming':  maximum trimming value (default is -1.e+21)");
+        _pprintLine_("      -'mintrimming':  minimum trimming value (default is +1.e+21)");
+        _pprintLine_("      -'minspacing':   minimum distance between observation (default is 0.01)");
+        _pprintLine_("");
 }