Changeset 23027

Timestamp:

07/30/18 15:35:06 (7 years ago)

Author:

caronlam

Message:

fixing missing fields in slr.py and slr.m

File:

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

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

@@ -25 +25 @@
                 self.tide_love_h            = 0
                 self.tide_love_k            = 0
-                self.fluid_love             = 0; 
-                self.equatorial_moi         = 0; 
-                self.polar_moi               = 0; 
-                self.angular_velocity       = 0;
+                self.fluid_love             = 0 
+                self.equatorial_moi         = 0 
+                self.polar_moi              = 0 
+                self.angular_velocity       = 0
                 self.rigid                  = 0
                 self.elastic                = 0
                 self.rotation               = 0
-                self.ocean_area_scaling     = 0;
-                steric_rate                                         = 0; #rate of ocean expansion from steric effects.
-                self.geodetic_run_frequency = 1; #how many time steps we skip before we run the geodetic part of the solver during transient
-                self.geodetic               = 0; #compute geodetic SLR? (in addition to steric?)
+                self.ocean_area_scaling     = 0
+                self.steric_rate            = 0 #rate of ocean expansion from steric effects.
+                self.geodetic_run_frequency = 1 #how many time steps we skip before we run the geodetic part of the solver during transient
+                self.geodetic               = 0 #compute geodetic SLR? (in addition to steric?)
                 self.degacc                 = 0
+                self.loop_increment         = 0
+                self.horiz                  = 0
+                self.Ngia                   = float('NaN')
+                self.Ugia                   = float('NaN')
                 self.requested_outputs      = []
                 self.transitions            = []
@@ -59 +63 @@
                         string="%s\n%s"%(string,fielddisplay(self,'polar_moi','polar moment of inertia [kg m^2]'))
                         string="%s\n%s"%(string,fielddisplay(self,'angular_velocity','mean rotational velocity of earth [per second]')); 
+                        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,'Ngia','rate of viscous (GIA) geoid expansion (in mm/yr)') 
+                        string="%s\n%s"%(string,fielddisplay(self,'Ugia','rate of viscous (GIA) bedrock uplift (in mm/yr)')
+                        string="%s\n%s"%(string,fielddisplay(self,'loop_increment','vector assembly (in the convolution) framentation')
+                        string="%s\n%s"%(string,fielddisplay(self,'geodetic','compute geodetic SLR? ( in addition to steric?) default 0');
+                        string="%s\n%s"%(string,fielddisplay(self,'geodetic_run_frequency','how many time steps we skip before we run SLR solver during transient (default: 1)');
                         string="%s\n%s"%(string,fielddisplay(self,'rigid','rigid earth graviational potential perturbation'))
                         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 [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'))
@@ -78 +87 @@
                 #maximum of non-linear iterations.
                 self.maxiter=5
+                self.loop_increment=200;
 
                 #computational flags: 
@@ -142 +152 @@
                 md = checkfield(md,'fieldname','slr.steric_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices]);
                 md = checkfield(md,'fieldname','slr.degacc','size',[1,1],'>=',1e-10)
+                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]);
+                md = checkfield(md,'fieldname','slr.Ugia','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices]);
                 md = checkfield(md,'fieldname','slr.requested_outputs','stringrow',1)
 
@@ -174 +188 @@
                 WriteData(fid,prefix,'object',self,'fieldname','steric_rate','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
                 WriteData(fid,prefix,'object',self,'fieldname','degacc','format','Double')
+                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','Ngia','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
+                WriteData(fid,prefix,'object',self,'fieldname','Ugia','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
                 WriteData(fid,prefix,'object',self,'fieldname','transitions','format','MatArray')
                 WriteData(fid,prefix,'object',self,'fieldname','geodetic','format','Integer')