Changeset 2187

Timestamp:

09/10/09 14:28:52 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added jump option in CM (waiting for Eric's commit)

File:

• issm/trunk/src/c/shared/Numerics/BrentSearch.cpp (modified) (2 diffs)

issm/trunk/src/c/shared/Numerics/BrentSearch.cpp

@@ -48 +48 @@
         tolerance=optpars->tolerance;
         maxiter=optpars->maxiter;
+        cmjump=optpars->cmjump;
         
         //initialize counter and boundaries
@@ -62 +63 @@
         fxmax = (*f)(xmax,optargs);
         _printf_("        %s    %12.6g  %12.6g  %s","   N/A",xmax,fxmax,"         N/A         boundary\n");
+
+        //test if jump option activated and xmin==0
+        if (!isnan(cmjump) && (xmin==0)){
+
+                //test ration between fxmin and fxmax. if < criterion, return
+                if((fxmin/fxmax)<cmjump){
+
+                        /*Assign output pointers: */
+                        *psearch_scalar=xmax;
+                        *pJ=fxmax;
+                        return;
+                }
+        }
 
         //initialize the other variables