Changeset 2188 for issm/trunk/src/c/parallel/control_core.cpp

Timestamp:

09/10/09 15:02:06 (16 years ago)

Author:

Eric.Larour

Message:

Added new jump capability to BrentSearch.
Some minor debugging otherwise.

File:

• issm/trunk/src/c/parallel/control_core.cpp (modified) (4 diffs)

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

@@ -29 +29 @@
         int     gsize;
         double* maxiter=NULL;
+        double* cmjump=NULL;
         double  tolx;
         double* param_g=NULL;
@@ -59 +60 @@
         model->FindParam(&optscal,"optscal");
         model->FindParam(&maxiter,"maxiter");
+        model->FindParam(&cmjump,"cmjump");
         model->FindParam(&tolx,"tolx");
         model->FindParam(&mincontrolconstraint,"mincontrolconstraint");
@@ -105 +107 @@
                 optargs.model=model;
                 optargs.param_g=param_g; optargs.grad_g=grad_g_double; optargs.inputs=inputs;optargs.n=n;
-                optpars.xmin=0; optpars.xmax=1; optpars.tolerance=tolx; optpars.maxiter=(int)maxiter[n];
+                optpars.xmin=0; optpars.xmax=1; optpars.tolerance=tolx; optpars.maxiter=(int)maxiter[n];optpars.cmjump=cmjump[n];
                 BrentSearch(&search_scalar,J+n,&optpars,&objectivefunctionC,&optargs);
                 _printf_("%s\n","      done.");
@@ -155 +157 @@
         xfree((void**)&optscal);
         xfree((void**)&maxiter);
+        xfree((void**)&cmjump);
         VecFree(&new_grad_g); //do not VecFree grad_g and grad_g_old, they point to new_grad_g
         xfree((void**)&grad_g_double);