Changeset 63

Timestamp:

04/27/09 10:59:54 (16 years ago)

Author:

Eric.Larour

Message:

Maxiter is a double* parameter, not int*

File:

• issm/trunk/src/c/parallel/control.cpp (modified) (2 diffs)

issm/trunk/src/c/parallel/control.cpp

@@ -38 +38 @@
         double* optscal=NULL;
         double* u_g_obs=NULL;
-        int*    maxiter=NULL;
+        double*    maxiter=NULL;
         double  tolx;
         double*   p_g=NULL;
@@ -117 +117 @@
                 _printf_("%s\n","      optimizing along gradient direction...");
                 optargs.femmodel=&femmodel; optargs.p_g=p_g; optargs.u_g_obs=u_g_obs; optargs.grad_g=grad_g_double; optargs.inputs=inputs;optargs.n=n;
-                optpars.xmin=-1; optpars.xmax=1; optpars.tolerance=tolx; optpars.maxiter=maxiter[n];
+                optpars.xmin=-1; optpars.xmax=1; optpars.tolerance=tolx; optpars.maxiter=(int)maxiter[n];
                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
                 _printf_("%s\n","      done.");