Changeset 17650 for issm/trunk-jpl/src/c/shared/Numerics/NewtonSolveDnorm.cpp

Timestamp:

04/04/14 15:40:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: done with X-TH LA

File:

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

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

@@ -15 +15 @@
         /*trivial solution*/
         if(c3==0.){
-                *pdnorm =0.;
+                *pdnorm = 0.;
                 return 0;
         }
@@ -26 +26 @@
 
         /*Initial guess*/
+        _assert_(dnorm>0.); 
         IssmDouble y1 = log10(dnorm);
 
@@ -41 +42 @@
                 }
 
-                if(counter>50) _error_("Could not converge");
+                if(counter>50) break;
         }
+
+        /*Avoid extremely large values that indicate non convergence*/
+        if(y2>50.) y2 = 50;
 
         /*Assign output pointer*/