Changeset 12706 for issm/trunk/src/c/solutions/controlconvergence.cpp

Timestamp:

07/24/12 10:36:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12703

File:

• issm/trunk/src/c/solutions/controlconvergence.cpp (modified) (2 diffs)

issm/trunk/src/c/solutions/controlconvergence.cpp

@@ -17 +17 @@
 #include "./solutions.h"
 
-bool controlconvergence(double J, double tol_cm){
+bool controlconvergence(IssmDouble J, IssmDouble tol_cm){
 
         int i;
@@ -23 +23 @@
 
         /*Has convergence been reached?*/
-        if (!isnan(tol_cm) && J<tol_cm){
+        if (!xIsNan<IssmDouble>(tol_cm) && J<tol_cm){
                 converged=true;
-                _printf_(VerboseConvergence(),"      Convergence criterion reached: J = %g < %g",J,tol_cm);
+                if(VerboseConvergence()) _pprintString_("      Convergence criterion reached: J = " << J << " < " << tol_cm);
         }