Changeset 21710

Timestamp:

05/08/17 10:46:29 (8 years ago)

Author:

jcuzzone

Message:

NEW: f precipitation temperature scaling factor added

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBd18opdd.m (modified) (5 diffs)
• SMBd18opdd.py (modified) (4 diffs)

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

@@ -12 +12 @@
                 rlapslgm                  = 0; 
                 dpermil                   = 0; 
+                f                         = 0;
                 Tdiff                     = NaN;
                 sealev                    = NaN;
@@ -63 +64 @@
                   self.rlapslgm   = 6.5;
                   self.dpermil    = 2.4;
+                  self.f          = 0.169;
                   
                 end % }}}
@@ -78 +80 @@
                                         md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,NaN],'singletimeseries',1);
                                         md = checkfield(md,'fieldname','smb.dpermil','>=',0,'numel',1);
+                                   md = checkfield(md,'fieldname','smb.f','>=',0,'numel',1);
                                 end
                         end
@@ -96 +99 @@
                                 fielddisplay(self,'delta18o','delta18o [per mil], required if pdd is activated and d18opd activated');  
                                 fielddisplay(self,'dpermil','degree per mil, required if d18opd is activated');                            
+                           fielddisplay(self,'f','precip/temperature scaling factor, required if d18opd is activated');
                         end
                         fielddisplay(self,'requested_outputs','additional outputs requested');
@@ -123 +127 @@
                                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','delta18o','format','DoubleMat','mattype',1,'timeserieslength',2,'yts',md.constants.yts);
                                 WriteData(fid,prefix,'object',self,'class','smb','fieldname','dpermil','format','Double');
+                           WriteData(fid,prefix,'object',self,'class','smb','fieldname','f','format','Double');
                         end
                         

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

@@ -20 +20 @@
                 self.rlapslgm                  = 0.
                 self.dpermil                   = 0.
+                self.f                         = 0.
                 self.Tdiff                     = float('NaN')
                 self.sealev                    = float('NaN')
@@ -83 +84 @@
                 self.rlapslgm   = 6.5
                 self.dpermil    = 2.4
-
+      self.f          = 0.169
                 return self
         #}}}
@@ -100 +101 @@
                                 md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,np.nan],'singletimeseries',1)
                                 md = checkfield(md,'fieldname','smb.dpermil','>=',0,'numel',[1])
-                
+                      md = checkfield(md,'fieldname','smb.f','>=',0,'numel',[1])
                 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
 
@@ -126 +127 @@
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','delta18o','format','DoubleMat','mattype',1,'timeserieslength',2,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','dpermil','format','Double')
-                        
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','f','format','Double')
                 #process requested outputs
                 outputs = self.requested_outputs