Changeset 14055

Timestamp:

11/29/12 16:18:13 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added numthreads as an option and error messages for interpolation requiring GSL

File:

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

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

@@ -22 +22 @@
         /*Intermediaries*/
         int           mindata,maxdata;
-        double        dmindata,dmaxdata; //FIXME (Options come as double but we want to retrive integers)
+        double        dmindata,dmaxdata,dnumthreads; //FIXME (Options come as double but we want to retrive integers)
         double        radius;
         char         *output       = NULL;
@@ -40 +40 @@
         options->Get(&dmindata,"mindata",1.);  mindata=int(dmindata);//FIXME (Options come as double but we want to retrive integers)
         options->Get(&dmaxdata,"maxdata",50.); maxdata=int(dmaxdata);//FIXME (Options come as double but we want to retrive integers)
+        options->Get(&dnumthreads,"numthreads",double(num)); num=int(dnumthreads);//FIXME (Options come as double but we want to retrive integers)
 
         /*Process observation dataset*/
@@ -119 +120 @@
         }
         else if(strcmp(output,"v4")==0){ //Inverse distance weighting
+#if !defined(_HAVE_GSL_)
+                _error_("GSL is required for v4 interpolation");
+#endif
                 /*initialize thread parameters: */
                 gate.n_interp     = n_interp;
@@ -138 +142 @@
         }
         else if(strcmp(output,"prediction")==0){
+#if !defined(_HAVE_GSL_)
+                _error_("GSL is required for v4 interpolation");
+#endif
 
                 /*initialize thread parameters: */