Changeset 14643

Timestamp:

04/18/13 11:00:04 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed basaltemp and surfacetemp, which are duplicates from temperature

Location:

issm/trunk-jpl/src/m/classes

Files:

• initialization.m (modified) (2 diffs)
• initialization.py (modified) (2 diffs)

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

@@ -12 +12 @@
                 pressure       = NaN;
                 temperature    = NaN;
-                surfacetemp    = NaN;
-                basaltemp      = NaN;
                 waterfraction  = NaN;
                 sediment_head  = NaN;
@@ -75 +73 @@
                         fielddisplay(obj,'pressure','pressure field [Pa]');
                         fielddisplay(obj,'temperature','temperature [K]');
-                        fielddisplay(obj,'surfacetemp','surface temperature [K]');
-                        fielddisplay(obj,'basaltemp','basal temperature [K]');
                         fielddisplay(obj,'waterfraction','fraction of water in the ice');
                         fielddisplay(obj,'sediment_head','sediment water head of subglacial system [m]');

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

@@ -21 +21 @@
                 self.pressure      = float('NaN')
                 self.temperature   = float('NaN')
-                self.surfacetemp   = float('NaN')
-                self.basaltemp     = float('NaN')
                 self.waterfraction = float('NaN')
                 self.watercolumn   = float('NaN')
@@ -40 +38 @@
                 string="%s\n%s"%(string,fielddisplay(self,'pressure','pressure [Pa]'))
                 string="%s\n%s"%(string,fielddisplay(self,'temperature','temperature [K]'))
-                string="%s\n%s"%(string,fielddisplay(self,'surfacetemp','surface temperature [K]'))
-                string="%s\n%s"%(string,fielddisplay(self,'basaltemp','basal temperature [K]'))
                 string="%s\n%s"%(string,fielddisplay(self,'waterfraction','fraction of water in the ice'))
                 string="%s\n%s"%(string,fielddisplay(self,'watercolumn','thickness of subglacial water [m]'))