Changeset 18728

Timestamp:

11/04/14 09:32:21 (10 years ago)

Author:

seroussi

Message:

NEW: implemented SMBpdd changes in python

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBpdd.m (modified) (2 diffs)
• SMBpdd.py (modified) (5 diffs)

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

@@ -96 +96 @@
                         fielddisplay(obj,'Tdiff','time interpolation parameter for temperature, 1D(year)');
                         fielddisplay(obj,'sealev','sea level [m], 1D(year)');
-                        fielddisplay(obj,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated');
+                        fielddisplay(obj,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated');
                         fielddisplay(obj,'precipitation','surface precipitation [m/yr water eq]');
                         fielddisplay(obj,'temperatures_presentday','monthly present day surface temperatures [K], required if pdd is activated and delta18o activated');
@@ -117 +117 @@
                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','rlaps','format','Double');
                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','rlapslgm','format','Double');
-                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','Pfac','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','Pfac','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean');
                         if obj.isdelta18o

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

@@ -19 +19 @@
                 self.desfac                    = 0.
                 self.s0p                       = 0.
+                self.s0t                       = 0.
+                self.rlaps                     = 0.
+                self.rlapslgm                  = 0.
+                self.Pfac                      = float('NaN')
+                self.Tdiff                     = float('NaN')
+                self.sealev                    = float('NaN')
                 self.isdelta18o                = 0
                 self.delta18o                  = float('NaN')
@@ -36 +42 @@
                 string="%s\n%s"%(string,fielddisplay(self,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)'))
                 string="%s\n%s"%(string,fielddisplay(self,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]'))
+                string="%s\n%s"%(string,fielddisplay(self,'s0t','should be set to elevation from temperature source (between 0 and a few 1000s m, default is 0) [m]'))
+                string="%s\n%s"%(string,fielddisplay(self,'rlaps','present day lapse rate [degree/km]'))
+                string="%s\n%s"%(string,fielddisplay(self,'rlapslgm','LGM lapse rate [degree/km]'))
+                string="%s\n%s"%(string,fielddisplay(self,'Pfac','time interpolation parameter for precipitation, 1D (year)'))
+                string="%s\n%s"%(string,fielddisplay(self,'Tdiff','time interpolation parameter for temperature, 1D (year)'))
+                string="%s\n%s"%(string,fielddisplay(self,'sealev','sea level [m], 1D(year)'))
                 string="%s\n%s"%(string,fielddisplay(self,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated'))
                 string="%s\n%s"%(string,fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if pdd is activated and delta18o activated'))
@@ -68 +80 @@
                 self.desfac     = 0.5
                 self.s0p        = 0.
+                self.s0t        = 0.
+                self.rlaps      = 6.5 
+                self.rlapslgm   = 6.5
 
                 return self
@@ -76 +91 @@
                         md = checkfield(md,'fieldname','surfaceforcings.desfac','<=',1,'numel',[1]);
                         md = checkfield(md,'fieldname','surfaceforcings.s0p','>=',0,'numel',[1]);
+                        md = checkfield(md,'fieldname','surfaceforcings.s0t','>=',0,'numel',[1]);
+                        md = checkfield(md,'fieldname','surfaceforcings.rlaps','>=',0,'numel',[1]);
+                        md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',[1]);
+                        md = checkfield(md,'fieldname','surfaceforcings.Pfac','NaN',1,'size',[2,NaN]);
+                        md = checkfield(md,'fieldname','surfaceforcings.Tdiff','NaN',1,'size',[2,NaN]);
+                        md = checkfield(md,'fieldname','surfaceforcings.sealev','NaN',1,'size',[2,NaN]);
                         if not self.isdelta18o:
                                 md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','forcing',1,'NaN',1)
@@ -98 +119 @@
                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','desfac','format','Double');
                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0p','format','Double');
+                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0t','format','Double');
+                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','rlaps','format','Double');
+                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','rlapslgm','format','Double');
+                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Pfac','format','DoubleMat','mattype',1);
+                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','Tdiff','format','DoubleMat','mattype',1);
+                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','sealev','format','DoubleMat','mattype',1);
                 if self.isdelta18o:
                         WriteData(fid,'object',self,'class','surfaceforcings','fieldname','temperatures_presentday','format','DoubleMat','mattype',1)