Changeset 13626

Timestamp:

10/11/12 12:19:16 (12 years ago)

Author:

jschierm

Message:

CHG: Updated to changeset [13119].

File:

• issm/trunk-jpl/src/m/classes/initialization.py (modified) (3 diffs)

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

@@ -24 +24 @@
                 self.pressure      = float('NaN')
                 self.temperature   = float('NaN')
+                self.surfacetemp   = float('NaN')
+                self.basaltemp     = float('NaN')
                 self.watercolumn   = float('NaN')
                 self.waterfraction = float('NaN')
@@ -41 +43 @@
                 string="%s\n%s"%(string,fielddisplay(self,'pressure','pressure field'))
                 string="%s\n%s"%(string,fielddisplay(self,'temperature','temperature in Kelvins'))
+                string="%s\n%s"%(string,fielddisplay(self,'surfacetemp','surface temperature in Kelvins'))
+                string="%s\n%s"%(string,fielddisplay(self,'basaltemp','basal temperature in Kelvins'))
                 string="%s\n%s"%(string,fielddisplay(self,'watercolumn','thickness of subglacial water'))
                 string="%s\n%s"%(string,fielddisplay(self,'waterfraction','fraction of water in the ice'))
@@ -86 +90 @@
                 WriteData(fid,'data',self.pressure,'format','DoubleMat','mattype',1,'enum',PressureEnum())
                 WriteData(fid,'data',self.temperature,'format','DoubleMat','mattype',1,'enum',TemperatureEnum())
+                WriteData(fid,'data',self.surfacetemp,'format','DoubleMat','mattype',1,'enum',TemperatureSurfaceEnum()) 
+                WriteData(fid,'data',self.basaltemp,'format','DoubleMat','mattype',1,'enum',TemperatureBasalEnum())
                 WriteData(fid,'data',self.watercolumn,'format','DoubleMat','mattype',1,'enum',WatercolumnEnum())
                 WriteData(fid,'data',self.waterfraction,'format','DoubleMat','mattype',1,'enum',WaterfractionEnum())