Changeset 5323

Timestamp:

08/17/10 15:52:05 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added some checks if output is NaN

Location:

issm/trunk/src/c

Files:

• modules/Orthx/Orthx.cpp (modified) (1 diff)
• shared/Numerics/BrentSearch.cpp (modified) (4 diffs)

issm/trunk/src/c/modules/Orthx/Orthx.cpp

@@ -30 +30 @@
                 ISSMERROR("||∂J/∂α||∞ = 0  gradient is zero");
         }
+        if(isnan(norm_new)){
+                ISSMERROR("input vector norm is NaN\n");
+        }
         VecScale(newgradj,1.0/norm_new);
 

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

@@ -56 +56 @@
         //get the value of the function at the first boundary
         fxmin = (*f)(xmin,optargs);
+        if isnan(fxmin) ISSMERROR("Function evaluation returned NaN");
 
         //display result
@@ -63 +64 @@
         //get the value of the function at the first boundary xmax and display result
         fxmax = (*f)(xmax,optargs);
+        if isnan(fxmax) ISSMERROR("Function evaluation returned NaN");
         _printf_("        %s    %12.6g  %12.6g  %s","   N/A",xmax,fxmax,"         N/A         boundary\n");
 
@@ -94 +96 @@
         //2: call the function to be evaluated
         fxbest = (*f)(x,optargs);
+        if isnan(fxbest) ISSMERROR("Function evaluation returned NaN");
         iter=iter+1;
 
@@ -190 +193 @@
                 //evaluate function on x
                 fx = (*f)(x,optargs);
+                if isnan(fx) ISSMERROR("Function evaluation returned NaN");
                 iter=iter+1;