Changeset 23028

Timestamp:

07/30/18 16:30:27 (7 years ago)

Author:

caronlam

Message:

fixing missing fields in slr.py

File:

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

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

@@ -65 +65 @@
                         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,'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'))
@@ -150 +150 @@
                 md = checkfield(md,'fieldname','slr.maxiter','size',[1,1],'>=',1)
                 md = checkfield(md,'fieldname','slr.geodetic_run_frequency','size',[1,1],'>=',1)
-                md = checkfield(md,'fieldname','slr.steric_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices]);
+                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.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)
 
@@ -186 +186 @@
                 WriteData(fid,prefix,'object',self,'fieldname','ocean_area_scaling','format','Boolean')
                 WriteData(fid,prefix,'object',self,'fieldname','geodetic_run_frequency','format','Integer')
-                WriteData(fid,prefix,'object',self,'fieldname','steric_rate','format','DoubleMat','mattype',1,'scale',1e-3/md.constants.yts);
+                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','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')