Changeset 24960

Timestamp:

06/03/20 15:00:13 (5 years ago)

Author:

Eric.Larour

Message:

CHG: replaced eartharea with planetradius.

File:

• issm/trunk-jpl/src/m/classes/slr.m (modified) (6 diffs)

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

@@ -29 +29 @@
                 geodetic               = 0; %compute geodetic SLR? (in addition to steric?)
                 degacc                 = 0;
-                loop_increment         = 0;
                 horiz                  = 0;
                 Ngia                   = NaN;
                 Ugia                   = NaN;
-                eartharea              = 4*pi*planetradius('earth')^2; 
+                planetradius           = planetradius('earth');
 
                 requested_outputs      = {};
@@ -55 +54 @@
                 %maximum of non-linear iterations.
                 self.maxiter=5;
-                self.loop_increment=200;
 
                 %computational flags: 
@@ -95 +93 @@
                 %horizontal displacement?  (not by default)
                 self.horiz=0;
+
+                %earth area
+                self.planetradius= planetradius('earth');
                 
                 end % }}}
@@ -123 +124 @@
                         md = checkfield(md,'fieldname','slr.degacc','size',[1 1],'>=',1e-10);
                         md = checkfield(md,'fieldname','slr.requested_outputs','stringrow',1);
-                        md = checkfield(md,'fieldname','slr.loop_increment','NaN',1,'Inf',1,'>=',1);
                         md = checkfield(md,'fieldname','slr.horiz','NaN',1,'Inf',1,'values',[0 1]);
                         md = checkfield(md,'fieldname','slr.Ngia','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
@@ -181 +181 @@
                         fielddisplay(self,'Ngia','rate of viscous (GIA) geoid expansion (in mm/yr)'); 
                         fielddisplay(self,'Ugia','rate of viscous (GIA) bedrock uplift (in mm/yr)'); 
-                        fielddisplay(self,'loop_increment','vector assembly (in the convolution) framentation');
                         fielddisplay(self,'geodetic','compute geodetic SLR? ( in addition to steric?) default 0');
                         fielddisplay(self,'geodetic_run_frequency','how many time steps we skip before we run SLR solver during transient (default: 1)');
@@ -220 +219 @@
                         WriteData(fid,prefix,'object',self,'fieldname','degacc','format','Double');
                         WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray');
-                        WriteData(fid,prefix,'object',self,'fieldname','loop_increment','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','horiz','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','geodetic','format','Integer');
-                        WriteData(fid,prefix,'object',self,'fieldname','eartharea','format','Double');
+                        WriteData(fid,prefix,'object',self,'fieldname','planetradius','format','Double');
                         
                         %process requested outputs