Changeset 22107

Timestamp:

09/19/17 12:01:47 (8 years ago)

Author:

adhikari

Message:

CHG: reltol set as default criterion for RSL convergence

Location:

issm/trunk-jpl/src/m/classes

Files:

• slr.js (modified) (2 diffs)
• slr.m (modified) (2 diffs)
• slr.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/slr.js

@@ -9 +9 @@
                 
                 //Convergence criterion: absolute, relative and residual
-                this.reltol=NaN; //default
-                this.abstol=0.001; //1 mm of sea level rise
+                this.reltol=0.01; // 1 per cent 
+                this.abstol=NaN;  //default
 
                 //maximum of non-linear iterations.
-                this.maxiter=10;
+                this.maxiter=5;
 
                 //computational flags: 
@@ -85 +85 @@
                 fielddisplay(this,'deltathickness','thickness change (main loading of the slr solution core [m]');
                 fielddisplay(this,'sealevel','current sea level (prior to computation) [m]');
-                fielddisplay(this,'reltol','sea level rise relative convergence criterion, (default, NaN: not applied)');
-                fielddisplay(this,'abstol','sea level rise absolute convergence criterion, NaN: not applied');
+                fielddisplay(this,'reltol','sea level rise relative convergence criterion, (NaN: not applied)');
+                fielddisplay(this,'abstol','sea level rise absolute convergence criterion, (default, NaN: not applied');
                 fielddisplay(this,'maxiter','maximum number of nonlinear iterations');
                 fielddisplay(this,'love_h','load Love number for radial displacement');

issm/trunk-jpl/src/m/classes/slr.m

@@ -41 +41 @@
                 
                 %Convergence criterion: absolute, relative and residual
-                self.reltol=NaN; %default
-                self.abstol=0.001; %1 mm of sea level rise
+                self.reltol=0.01; % 1 per cent 
+                self.abstol=NaN;  % default 
 
                 %maximum of non-linear iterations.
-                self.maxiter=10;
+                self.maxiter=5;
 
                 %computational flags: 
@@ -124 +124 @@
                         fielddisplay(self,'deltathickness','thickness change (main loading of the slr solution core [m]');
                         fielddisplay(self,'sealevel','current sea level (prior to computation) [m]');
-                        fielddisplay(self,'reltol','sea level rise relative convergence criterion, (default, NaN: not applied)');
-                        fielddisplay(self,'abstol','sea level rise absolute convergence criterion, NaN: not applied');
+                        fielddisplay(self,'reltol','sea level rise relative convergence criterion, (NaN: not applied)');
+                        fielddisplay(self,'abstol','sea level rise absolute convergence criterion, (default, NaN: not applied');
                         fielddisplay(self,'maxiter','maximum number of nonlinear iterations');
                         fielddisplay(self,'love_h','load Love number for radial displacement');

issm/trunk-jpl/src/m/classes/slr.py

@@ -44 +44 @@
                         string='   slr parameters:'
                         string="%s\n%s"%(string,fielddisplay(self,'deltathickness','thickness change (main loading of the slr solution core [m]'))
-                        string="%s\n%s"%(string,fielddisplay(self,'reltol','sea level rise relative convergence criterion, (default, NaN: not applied)'))
-                        string="%s\n%s"%(string,fielddisplay(self,'abstol','sea level rise absolute convergence criterion, NaN: not applied'))
+                        string="%s\n%s"%(string,fielddisplay(self,'reltol','sea level rise relative convergence criterion, (NaN: not applied)'))
+                        string="%s\n%s"%(string,fielddisplay(self,'abstol','sea level rise absolute convergence criterion, (default, NaN: not applied'))
                         string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of nonlinear iterations'))
                         string="%s\n%s"%(string,fielddisplay(self,'love_h','load Love number for radial displacement'))
@@ -69 +69 @@
                 
                 #Convergence criterion: absolute, relative and residual
-                self.reltol=float('NaN') #default
-                self.abstol=0.001 #1 mm of sea level rise
+                self.reltol=0.01 # 1 per cent 
+                self.abstol=float('NaN') #default
 
                 #maximum of non-linear iterations.
-                self.maxiter=10
+                self.maxiter=5
 
                 #computational flags: