Changeset 22808

Timestamp:

05/29/18 09:46:40 (7 years ago)

Author:

adhikari

Message:

minor

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

@@ -88 +88 @@
                         console.log(sprintf('   Sealevelrise solution parameters:'));
 
-                        fielddisplay(this,'deltathickness','thickness change (main loading of the slr solution core [m]');
+                        fielddisplay(this,'deltathickness','thickness change: ice height equivalent [m]');
                         fielddisplay(this,'sealevel','current sea level (prior to computation) [m]');
                         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,'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');
@@ -105 +105 @@
                         fielddisplay(this,'elastic','elastic earth graviational potential perturbation');
                         fielddisplay(this,'rotation','rotational earth potential perturbation');
-                        fielddisplay(this,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'); 
-                        fielddisplay(this,'steric_rate','rate of steric ocean expansion (in mm/yr)'); 
+                        fielddisplay(this,'ocean_area_scaling','correction for model representation of ocean area (default: No correction)'); 
+                        fielddisplay(this,'steric_rate','rate of steric ocean expansion [mm/yr]'); 
                         fielddisplay(this,'degacc',"accuracy (default .01 deg) for numerical discretization of the Green's functions");
                         fielddisplay(this,'transitions','indices into parts of the mesh that will be icecaps');

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

@@ -122 +122 @@
                         disp(sprintf('   slr parameters:'));
 
-                        fielddisplay(self,'deltathickness','thickness change (main loading of the slr solution core [m]');
+                        fielddisplay(self,'deltathickness','thickness change: ice height equivalent [m]');
                         fielddisplay(self,'sealevel','current sea level (prior to computation) [m]');
                         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,'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');
@@ -139 +139 @@
                         fielddisplay(self,'elastic','elastic earth graviational potential perturbation');
                         fielddisplay(self,'rotation','earth rotational potential perturbation');
-                        fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'); 
-                        fielddisplay(self,'steric_rate','rate of steric ocean expansion (in mm/yr)'); 
+                        fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area (default: No correction)'); 
+                        fielddisplay(self,'steric_rate','rate of steric ocean expansion [mm/yr]'); 
                         fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions');
                         fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps');

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

@@ -43 +43 @@
         def __repr__(self): # {{{
                         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,'deltathickness','thickness change: ice height equivalent [m]'))
                         string="%s\n%s"%(string,fielddisplay(self,'sealevel','current sea level (prior to computation) [m]'))
                         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,'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'))
@@ -60 +60 @@
                         string="%s\n%s"%(string,fielddisplay(self,'elastic','elastic earth graviational potential perturbation'))
                         string="%s\n%s"%(string,fielddisplay(self,'rotation','earth rotational potential perturbation'))
-                        string="%s\n%s"%(string,fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area [default: No correction]'))
-                        string="%s\n%s"%(string,fielddisplay(self,'steric_rate','rate of steric ocean expansion (in mm/yr)'))
+                        string="%s\n%s"%(string,fielddisplay(self,'ocean_area_scaling','correction for model representation of ocean area (default: No correction)'))
+                        string="%s\n%s"%(string,fielddisplay(self,'steric_rate','rate of steric ocean expansion [mm/yr]'))
                         string="%s\n%s"%(string,fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions'))
                         string="%s\n%s"%(string,fielddisplay(self,'transitions','indices into parts of the mesh that will be icecaps'))