Changeset 13036 for issm/trunk-jpl/src/c/shared/Numerics/OptimalSearch.cpp

Timestamp:

08/14/12 16:58:21 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renaming _error2_ _error_

File:

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

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

@@ -41 +41 @@
         //get the value of the function at the first boundary
         fx1= (*f)(x1,optargs);
-        if (xIsNan<IssmDouble>(fx1)) _error2_("Function evaluation returned NaN");
+        if (xIsNan<IssmDouble>(fx1)) _error_("Function evaluation returned NaN");
         cout<<setprecision(5);
         if(VerboseControl()) _pprintLine_("");
@@ -57 +57 @@
                 iter++;
                 fx2 = (*f)(x2,optargs);
-                if (xIsNan<IssmDouble>(fx2)) _error2_("Function evaluation returned NaN");
+                if (xIsNan<IssmDouble>(fx2)) _error_("Function evaluation returned NaN");
                 if(VerboseControl())
                  _pprintLine_("         "<<setw(5)<<iter<<"    "<<setw(12)<<x2<<"  "<<setw(12)<<fx2<<"  "<<(fabs(x2-x1)>fabs(fx2-fx1)?fabs(fx2-fx1):fabs(x2-x1)));