Changeset 9679 for issm/trunk/src/m/solutions/convergence.m

Timestamp:

09/08/11 08:07:18 (14 years ago)

Author:

seroussi

Message:

added diagnostic class

File:

• issm/trunk/src/m/solutions/convergence.m (modified) (5 diffs)

issm/trunk/src/m/solutions/convergence.m

@@ -6 +6 @@
 %Get convergence options
 yts=parameters.ConstantsYts;
-eps_res=parameters.EpsRes;
-eps_rel=parameters.EpsRel;
-eps_abs=parameters.EpsAbs;
+restol=parameters.DiagnosticRestol;
+reltol=parameters.DiagnosticReltol;
+abstol=parameters.DiagnosticAbstol;
 
 %initialization
@@ -25 +25 @@
         error('convergence error message: mechanical equilibrium convergence criterion is NaN!'); 
 end
-if (res<=eps_res),
-        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' < ',eps_res*100,' %');
+if (res<=restol),
+        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' < ',restol*100,' %');
         converged=true;
 else
-        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' > ',eps_res*100,' %');
+        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' > ',restol*100,' %');
         converged=false;
 end
 
 %Relative criterion (optional)
-if ((~isnan(eps_rel)) | (VerboseConvergence())),
+if ((~isnan(reltol)) | (VerboseConvergence())),
 
         %compute ndu/nu
@@ -45 +45 @@
 
         %print criterion
-        if ~isnan(eps_rel),
+        if ~isnan(reltol),
                 if nu, %avoid "dividing by zero" warning
-                        if (ndu/nu<=eps_rel),
-                                issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' < ',eps_rel*100,' %');
+                        if (ndu/nu<=reltol),
+                                issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' < ',reltol*100,' %');
                         else
-                                issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' > ',eps_rel*100,' %');
+                                issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' > ',reltol*100,' %');
                                 converged=false;
                         end
@@ -65 +65 @@
 
 %Absolute criterion (optional)
-if ((~isnan(eps_abs)) | VerboseConvergence()),
+if ((~isnan(abstol)) | VerboseConvergence()),
 
         %compute max(du)
@@ -75 +75 @@
 
         %print criterion
-        if ~isnan(eps_abs),
-                if (nduinf<=eps_abs),
-                        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' < ',eps_abs,' m/yr');
+        if ~isnan(abstol),
+                if (nduinf<=abstol),
+                        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' < ',abstol,' m/yr');
                 else
-                        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' > ',eps_abs,' m/yr');
+                        issmprintf(VerboseConvergence(),'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' > ',abstol,' m/yr');
                         converged=false;
                 end