Changeset 14198

Timestamp:

12/19/12 10:19:22 (12 years ago)

Author:

jschierm

Message:

CHG: Update python surfaceforcings to match matlab [14175] (plus related minor changes).

Location:

issm/trunk-jpl

Files:

• src/m/classes/surfaceforcings.py (modified) (4 diffs)
• test/NightlyRun/test328.m (modified) (1 diff)
• test/NightlyRun/test328.py (modified) (1 diff)
• test/NightlyRun/test329.m (modified) (1 diff)
• test/NightlyRun/test329.py (modified) (1 diff)

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

@@ -21 +21 @@
                 self.issmbgradients = 0
                 self.isdelta18o = 0
-                self.hc = float('NaN')
                 self.href = float('NaN')
                 self.smbref = float('NaN')
-                self.smb_pos_max = float('NaN')
-                self.smb_pos_min = float('NaN')
-                self.a_pos = float('NaN')
                 self.b_pos = float('NaN')
-                self.a_neg = float('NaN')
                 self.b_neg = float('NaN')
                 self.monthlytemperatures = float('NaN')
@@ -57 +52 @@
                 string="%s\n%s"%(string,fielddisplay(self,'delta18o_surface','surface elevation of the delta18o site, required if pdd is activated and delta18o activated'))
                 string="%s\n%s"%(string,fielddisplay(self,'issmbgradients','is smb gradients method activated (0 or 1, default is 0)'))
-                string="%s\n%s"%(string,fielddisplay(self,'hc',' elevation of intersection between accumulation and ablation regime required if smb gradients is activated'))
                 string="%s\n%s"%(string,fielddisplay(self,'href',' reference elevation from which deviation is used to calculate SMB adjustment in smb gradients method'))
                 string="%s\n%s"%(string,fielddisplay(self,'smbref',' reference smb from which deviation is calculated in smb gradients method'))
-                string="%s\n%s"%(string,fielddisplay(self,'smb_pos_max',' maximum value of positive smb required if smb gradients is activated'))
-                string="%s\n%s"%(string,fielddisplay(self,'smb_pos_min',' minimum value of positive smb required if smb gradients is activated'))
-                string="%s\n%s"%(string,fielddisplay(self,'a_pos',' intercept of hs - smb regression line for accumulation regime required if smb gradients is activated'))
                 string="%s\n%s"%(string,fielddisplay(self,'b_pos',' slope of hs - smb regression line for accumulation regime required if smb gradients is activated'))
-                string="%s\n%s"%(string,fielddisplay(self,'a_neg',' intercept of hs - smb regression line for ablation regime required if smb gradients is activated'))
                 string="%s\n%s"%(string,fielddisplay(self,'b_neg',' slope of hs - smb regression line for ablation regime required if smb gradients is activated'))
 
@@ -96 +86 @@
                                         md = checkfield(md,'surfaceforcings.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1)
                         elif self.issmbgradients:
-                                md = checkfield(md,'surfaceforcings.hc','forcing',1,'NaN',1)
                                 md = checkfield(md,'surfaceforcings.href','forcing',1,'NaN',1)
                                 md = checkfield(md,'surfaceforcings.smbref','forcing',1,'NaN',1)
-                                md = checkfield(md,'surfaceforcings.smb_pos_max','forcing',1,'NaN',1)
-                                md = checkfield(md,'surfaceforcings.smb_pos_min','forcing',1,'NaN',1)
-                                md = checkfield(md,'surfaceforcings.a_pos','forcing',1,'NaN',1)
                                 md = checkfield(md,'surfaceforcings.b_pos','forcing',1,'NaN',1)
-                                md = checkfield(md,'surfaceforcings.a_neg','forcing',1,'NaN',1)
                                 md = checkfield(md,'surfaceforcings.b_neg','forcing',1,'NaN',1)
                         else:
@@ -134 +119 @@
 
                 if self.issmbgradients:
-                        WriteData(fid,'object',self,'fieldname','hc','format','DoubleMat','mattype',1)
                         WriteData(fid,'object',self,'fieldname','href','format','DoubleMat','mattype',1)
                         WriteData(fid,'object',self,'fieldname','smbref','format','DoubleMat','mattype',1)
-                        WriteData(fid,'object',self,'fieldname','smb_pos_max','format','DoubleMat','mattype',1)
-                        WriteData(fid,'object',self,'fieldname','smb_pos_min','format','DoubleMat','mattype',1)
-                        WriteData(fid,'object',self,'fieldname','a_pos','format','DoubleMat','mattype',1)
                         WriteData(fid,'object',self,'fieldname','b_pos','format','DoubleMat','mattype',1)
-                        WriteData(fid,'object',self,'fieldname','a_neg','format','DoubleMat','mattype',1)
                         WriteData(fid,'object',self,'fieldname','b_neg','format','DoubleMat','mattype',1)
         # }}}

issm/trunk-jpl/test/NightlyRun/test328.m

@@ -7 +7 @@
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
 md.surfaceforcings.href=md.geometry.surface;
-md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
+md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.transient.requested_outputs=TotalSmbEnum();
 md.cluster=generic('name',oshostname(),'np',3);

issm/trunk-jpl/test/NightlyRun/test328.py

@@ -19 +19 @@
 md.transient.requested_outputs=TotalSmbEnum()
 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
-md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
+md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.cluster=generic('name',oshostname(),'np',3)
 md=solve(md,TransientSolutionEnum())

issm/trunk-jpl/test/NightlyRun/test329.m

@@ -8 +8 @@
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
 md.surfaceforcings.href=md.geometry.surface;
-md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
+md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.transient.requested_outputs=TotalSmbEnum();
 md.cluster=generic('name',oshostname(),'np',3);

issm/trunk-jpl/test/NightlyRun/test329.py

@@ -19 +19 @@
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
-md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
+md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.transient.requested_outputs=TotalSmbEnum()
 md.cluster=generic('name',oshostname(),'np',3)