Changeset 14764

Timestamp:

04/26/13 08:08:20 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updated python surfaceforcings

Location:

issm/trunk-jpl/src/m/classes

Files:

• surfaceforcings.m (modified) (1 diff)
• surfaceforcings.py (modified) (5 diffs)

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

@@ -48 +48 @@
                                 md = checkfield(md,'surfaceforcings.issmbgradients','numel',[1],'values',[0 1]);
                                 if(obj.ispdd)
-                                  md = checkfield(md,'surfaceforcings.desfac','<=',1);
-                                  md = checkfield(md,'surfaceforcings.s0p','>=',0);
+                                  md = checkfield(md,'surfaceforcings.desfac','<=',1,'numel',1);
+                                  md = checkfield(md,'surfaceforcings.s0p','>=',0,'numel',1);
                                         if(obj.isdelta18o==0)
                                                 md = checkfield(md,'surfaceforcings.monthlytemperatures','forcing',1,'NaN',1);

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

@@ -28 +28 @@
                 self.temperatures_lgm          = float('NaN')
                 self.precipitations_presentday = float('NaN')
+                self.desfac                    = 0.
+                self.s0p                       = 0.
 
                 #set defaults
@@ -39 +41 @@
                 string="%s\n%s"%(string,fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]'))
                 string="%s\n%s"%(string,fielddisplay(self,'ispdd','is pdd activated (0 or 1, default is 0)'))
+                string="%s\n%s"%(string,fielddisplay(self,'desfac','desertification elevation factor (between 0 and 1, default is 0.5) [m]'))
                 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,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated'))
                 string="%s\n%s"%(string,fielddisplay(self,'precipitation','surface precipitation [m/yr water eq]'))
@@ -61 +65 @@
                 self.issmbgradients=0
                 self.isdelta18o=0
+                self.desfac=0.5
+                self.s0p=0.
 
                 return self
@@ -70 +76 @@
                         md = checkfield(md,'surfaceforcings.issmbgradients','numel',[1],'values',[0,1])
                         if   self.ispdd:
+                                md = checkfield(md,'surfaceforcings.desfac','<=',1,'numel',[1]);
+                                md = checkfield(md,'surfaceforcings.s0p','>=',0,'numel',[1]);
                                 if not self.isdelta18o:
                                         md = checkfield(md,'surfaceforcings.monthlytemperatures','forcing',1,'NaN',1)
@@ -99 +107 @@
 
                 if self.ispdd:
+                        WriteData(fid,'object',self,'fieldname','desfac','format','Double');
+                        WriteData(fid,'object',self,'fieldname','s0p','format','Double');
                         if self.isdelta18o:
                                 WriteData(fid,'object',self,'fieldname','temperatures_presentday','format','DoubleMat','mattype',1)