Changeset 19190

Timestamp:

03/09/15 09:42:38 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: temporary change for python isd18opm

File:

• issm/trunk-jpl/src/m/classes/SMBpdd.py (modified) (5 diffs)

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

@@ -27 +27 @@
                 self.isdelta18o                = 0
                 self.ismungsm                  = 0
+                self.isd18opd                  = 0
                 self.delta18o                  = float('NaN')
                 self.delta18o_surface          = float('NaN')
@@ -42 +43 @@
                 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,'ismungsm','is temperature and precipitation mungsm parametrisation activated (0 or 1, default is 0)'))
+                string="%s\n%s"%(string,fielddisplay(self,'isd18opd','is delta18o parametrisation from present day temperature and precipitation 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,'s0p','should be set to elevation from precip source (between 0 and a few 1000s m, default is 0) [m]'))
@@ -71 +73 @@
         def extrude(self,md): # {{{
 
-                if not (self.isdelta18o and self.ismungsm):
+                if not (self.isdelta18o and self.ismungsm and self.isd18opd):
                         self.precipitation=project3d(md,'vector',self.precipitation,'type','node')
                         self.monthlytemperatures=project3d(md,'vector',self.monthlytemperatures,'type','node')
@@ -114 +116 @@
                         md = checkfield(md,'fieldname','surfaceforcings.rlapslgm','>=',0,'numel',[1])
 
-                        if (self.isdelta18o==0 and self.ismungsm==0):
+                        if (self.isdelta18o==0 and self.ismungsm==0 and self.isd18opd):
                                 md = checkfield(md,'fieldname','surfaceforcings.monthlytemperatures','NaN',1)
                                 md = checkfield(md,'fieldname','surfaceforcings.precipitation','NaN',1)
@@ -145 +147 @@
                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isdelta18o','format','Boolean')
                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','ismungsm','format','Boolean')
+                WriteData(fid,'object',self,'class','surfaceforcings','fieldname','isd18opd','format','Boolean')
                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','desfac','format','Double')
                 WriteData(fid,'object',self,'class','surfaceforcings','fieldname','s0p','format','Double')