Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/settings.js

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/settings.js (modified) (5 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/settings.js

@@ -27 +27 @@
                 //upload options: 
                 upload_port         = 0;
+                
+                //throw an error if solver residue exceeds this value
+                self.solver_residue_threshold=1e-6;
 
         }// }}}
@@ -43 +46 @@
                 fielddisplay(this,'upload_port','port login (default is 0)');
                 fielddisplay(this,'upload_filename','unique id generated when uploading the file to server');
+                fielddisplay(this,'solver_residue_threshold','throw an error if solver residue exceeds this value');
 
 
@@ -58 +62 @@
                         checkfield(md,'fieldname','settings.recording_frequency','numel',[1],'>=',0);
                         checkfield(md,'fieldname','settings.waitonlock','numel',[1]);
+                        checkfield(md,'fieldname','settings.solver_residue_threshold','numel',[1],'>',0);
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
@@ -65 +70 @@
                         WriteData(fid,prefix,'object',this,'fieldname','output_frequency','format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','recording_frequency','format','Integer');
+                        WriteData(fid,prefix,'object',this,'fieldname','solver_residue_threshold','format','Double');
                         if (this.waitonlock>0) WriteData(fid,prefix,'name','md.settings.waitonlock','data',true,'format','Boolean');
                         else WriteData(fid,prefix,'name','md.settings.waitonlock','data',false,'format','Boolean');
@@ -83 +89 @@
         this.upload_port         = 0;
         this.upload_filename     = '';
+        this.solver_residue_threshold = 0;
         this.setdefaultparameters();
         //}}}