Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/SMBd18opdd.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/SMBd18opdd.py (modified) (7 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/SMBd18opdd.py

@@ -1 @@
-import numpy
+import numpy as np
 from fielddisplay import fielddisplay
 from checkfield import checkfield
@@ -20 +20 @@
                 self.rlapslgm                  = 0.
                 self.dpermil                   = 0.
+                self.f                         = 0.
                 self.Tdiff                     = float('NaN')
                 self.sealev                    = float('NaN')
@@ -64 +65 @@
         def initialize(self,md): # {{{
 
-                if numpy.all(numpy.isnan(self.s0p)):
-                        self.s0p=numpy.zeros((md.mesh.numberofvertices,1))
+                if np.all(np.isnan(self.s0p)):
+                        self.s0p=np.zeros((md.mesh.numberofvertices))
                         print "      no SMBd18opdd.s0p specified: values set as zero"
 
-                if numpy.all(numpy.isnan(self.s0t)):
-                        self.s0t=numpy.zeros((md.mesh.numberofvertices,1))
+                if np.all(np.isnan(self.s0t)):
+                        self.s0t=np.zeros((md.mesh.numberofvertices))
                         print "      no SMBd18opdd.s0t specified: values set as zero"
                         
@@ -83 +84 @@
                 self.rlapslgm   = 6.5
                 self.dpermil    = 2.4
-
+                self.f          = 0.169
                 return self
         #}}}
@@ -90 +91 @@
                 if 'MasstransportAnalysis' in analyses:
                         md = checkfield(md,'fieldname','smb.desfac','<=',1,'numel',[1])
-                        md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
-                        md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1])
+                        md = checkfield(md,'fieldname','smb.s0p','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                        md = checkfield(md,'fieldname','smb.s0t','>=',0,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
                         md = checkfield(md,'fieldname','smb.rlaps','>=',0,'numel',[1])
                         md = checkfield(md,'fieldname','smb.rlapslgm','>=',0,'numel',[1])
@@ -98 +99 @@
                                 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)
-                                md = checkfield(md,'fieldname','smb.delta18o','NaN',1,'Inf',1,'size',[2,numpy.nan],'singletimeseries',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])
-                
+                                md = checkfield(md,'fieldname','smb.f','>=',0,'numel',[1])
+
                 md = checkfield(md,'fieldname','masstransport.requested_outputs','stringrow',1)
 
@@ -126 +128 @@
                         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