Changeset 13056 for issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp

Timestamp:

08/15/12 19:10:41 (13 years ago)

Author:

glperez

Message:

CHG: Correction from the 13046 revision

File:

• issm/trunk-jpl/src/c/shared/Numerics/BrentSearch.cpp (modified) (4 diffs)

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

@@ -44 +44 @@
         iter=0;
         fxmin = (*f)(xmin,optargs);
-        if (xIsNan<IssmDouble>(fxmin)) _error2_("Function evaluation returned NaN");
+        if (xIsNan<IssmDouble>(fxmin)) _error_("Function evaluation returned NaN");
         cout<<setprecision(5);
         if(VerboseControl()) _pprintLine_("");
@@ -51 +51 @@
         if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<xmin<<"  "<<setw(12)<<fxmin<<"           N/A         boundary");
         fxmax = (*f)(xmax,optargs);
-        if (xIsNan<IssmDouble>(fxmax)) _error2_("Function evaluation returned NaN");
+        if (xIsNan<IssmDouble>(fxmax)) _error_("Function evaluation returned NaN");
         if(VerboseControl()) _pprintLine_("           N/A    "<<setw(12)<<xmax<<"  "<<setw(12)<<fxmax<<"           N/A         boundary");
 
@@ -75 +75 @@
         /*2: call the function to be evaluated*/
         fxbest = (*f)(x,optargs);
-        if(xIsNan<IssmDouble>(fxbest)) _error2_("Function evaluation returned NaN");
+        if(xIsNan<IssmDouble>(fxbest)) _error_("Function evaluation returned NaN");
         iter=iter+1;
 
@@ -159 +159 @@
                 //evaluate function on x
                 fx = (*f)(x,optargs);
-                if(xIsNan<IssmDouble>(fx)) _error2_("Function evaluation returned NaN");
+                if(xIsNan<IssmDouble>(fx)) _error_("Function evaluation returned NaN");
                 iter=iter+1;