Changeset 22855

Timestamp:

06/20/18 18:27:22 (7 years ago)

Author:

schlegel

Message:

CHG: update python class to reflect addition of reconstructed pdd climatologies

File:

• issm/trunk-jpl/src/m/classes/SMBd18opdd.py (modified) (6 diffs)

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

@@ -27 +27 @@
                 self.issetpddfac               = 0
                 self.istemperaturescaled       = 0
+                self.isprecipscaled            = 0
                 self.delta18o                  = float('NaN')
                 self.delta18o_surface          = float('NaN')
                 self.temperatures_presentday   = float('NaN')
                 self.precipitations_presentday = float('NaN')
+                self.temperatures_reconstructed   = float('NaN')
+                self.precipitations_reconstructed = float('NaN')
                 self.pddfac_snow               = float('NaN')
                 self.pddfac_ice                = float('NaN')
@@ -50 +53 @@
                         string="%s\n%s"%(string,fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if delta18o/mungsm is activated'))
                         string="%s\n%s"%(string,fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if delta18o or mungsm is activated'))
-                        string="%s\n%s"%(string,fielddisplay(self,'istemperaturescaled','if delta18o parametrisation from present day temperature and precipitation is activated, is temperature scaled to delta18o value? (0 or 1, default is 0)'))
+                        string="%s\n%s"%(string,fielddisplay(self,'istemperaturescaled','if delta18o parametrisation from present day temperature and precipitation is activated, is temperature scaled to delta18o value? (0 or 1, default is 1)'))
+                        string="%s\n%s"%(string,fielddisplay(self,'isprecipscaled','if delta18o parametrisation from present day temperature and precipitation is activated, is precipitation scaled to delta18o value? (0 or 1, default is 1)'))
+                        
+                        if self.istemperaturescaled==0:
+                                string="%s\n%s"%(string,fielddisplay(self,'temperatures_reconstructed','monthly historical surface temperatures [K], required if delta18o/mungsm/d18opd is activated and istemperaturescaled is not activated'))
+                                
+                        if self.isprecipscaled==0:
+                                string="%s\n%s"%(string,fielddisplay(self,'precipitations_reconstructed','monthly historical precipitation [m/yr water eq], required if delta18o/mungsm/d18opd is activated and isprecipscaled is not activated'))
+
                         string="%s\n%s"%(string,fielddisplay(self,'delta18o','delta18o [per mil], required if pdd is activated and delta18o activated'))
                         string="%s\n%s"%(string,fielddisplay(self,'dpermil','degree per mil, required if d18opd is activated'))
@@ -65 +76 @@
 
                 if self.isd18opd: self.temperatures_presentday=project3d(md,'vector',self.temperatures_presentday,'type','node')
+                if self.isd18opd: self.precipitations_presentday=project3d(md,'vector',self.precipitations_presentday,'type','node')
+                if self.istemperaturescaled==0: self.temperatures_reconstructed=project3d(md,'vector',self.temperatures_reconstructed,'type','node')
+                if self.isprecipscaled==0: self.temperatures_reconstructed=project3d(md,'vector',self.precipitations_reconstructed,'type','node')
                 if self.isd18opd: self.precipitations_presentday=project3d(md,'vector',self.precipitations_presentday,'type','node')
                 if self.issetpddfac: self.pddfac_snow=project3d(md,'vector',self.pddfac_snow,'type','node')
@@ -94 +108 @@
                 self.isd18opd   = 1
                 self.istemperaturescaled = 1
+                self.isprecipscaled = 1
                 self.desfac     = 0.5
                 self.rlaps      = 6.5 
@@ -116 +131 @@
                                 multt=np.ceil(lent/12.)*12.
                                 multp=np.ceil(lenp/12.)*12.
-                                md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,multt],'NaN',1,'Inf',1,'timeseries',1)
-                                md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,multp],'NaN',1,'Inf',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','smb.temperatures_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
+                                md = checkfield(md,'fieldname','smb.precipitations_presentday','size',[md.mesh.numberofvertices+1,12],'NaN',1,'Inf',1,'timeseries',1)
+
+                                if self.istemperaturescaled==0:
+                                        lent=float(np.size(self.temperatures_reconstructed,1))
+                                        multt=np.ceil(lent/12.)*12.
+                                        md = checkfield(md,'fieldname','smb.temperatures_reconstructed','size',[md.mesh.numberofvertices+1,multt],'NaN',1,'Inf',1,'timeseries',1)
+
+                                if self.isprecipscaled==0:
+                                        lenp=float(np.size(self.precipitations_reconstructed,1))
+                                        multp=np.ceil(lent/12.)*12.
+                                        md = checkfield(md,'fieldname','smb.precipitations_reconstructed','size',[md.mesh.numberofvertices+1,multt],'NaN',1,'Inf',1,'timeseries',1)
+
                                 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])
@@ -151 +177 @@
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','precipitations_presentday','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','istemperaturescaled','format','Boolean')
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','isprecipscaled','format','Boolean')
+
+                        if self.istemperaturescaled==0:
+                                WriteData(fid,prefix,'object',self,'class','smb','fieldname','temperatures_reconstructed','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
+
+                        if self.isprecipscaled==0:
+                                WriteData(fid,prefix,'object',self,'class','smb','fieldname','precipitations_reconstructed','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
+
                         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')