Changeset 14640 for issm/trunk-jpl/src/m/classes/initialization.py

Timestamp:

04/18/13 10:20:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added units to all fields and homogenized python classes

File:

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

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

@@ -1 @@
-#module imports
 import numpy
 from fielddisplay import fielddisplay
@@ -14 +13 @@
         """
 
-        #properties
-        def __init__(self):
-                # {{{ Properties
+        def __init__(self): # {{{
                 
                 self.vx            = float('NaN')
@@ -29 +26 @@
                 self.watercolumn   = float('NaN')
                 self.sediment_head  = float('NaN')
-                self.water_pressure = float('NaN')
 
                 #set defaults
@@ -35 +31 @@
 
                 #}}}
-        def __repr__(self):
-                # {{{ Display
+        def __repr__(self): # {{{
                 string='   initial field values:'
 
-                string="%s\n%s"%(string,fielddisplay(self,'vx','x component of velocity'))
-                string="%s\n%s"%(string,fielddisplay(self,'vy','y component of velocity'))
-                string="%s\n%s"%(string,fielddisplay(self,'vz','z component of velocity'))
-                string="%s\n%s"%(string,fielddisplay(self,'vel','velocity norm'))
-                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,'vx','x component of velocity [m/yr]'))
+                string="%s\n%s"%(string,fielddisplay(self,'vy','y component of velocity [m/yr]'))
+                string="%s\n%s"%(string,fielddisplay(self,'vz','z component of velocity [m/yr]'))
+                string="%s\n%s"%(string,fielddisplay(self,'vel','velocity norm [m/yr]'))
+                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'))
-                string="%s\n%s"%(string,fielddisplay(self,'sediment_head','sediment water head of subglacial system (meters)'))
-                string="%s\n%s"%(string,fielddisplay(self,'water_pressure','water pressure due to the sediment head (Pa)'))
+                string="%s\n%s"%(string,fielddisplay(self,'watercolumn','thickness of subglacial water [m]'))
+                string="%s\n%s"%(string,fielddisplay(self,'sediment_head','sediment water head of subglacial system [m]'))
 
                 return string
                 #}}}
-                
-        def setdefaultparameters(self):
-                # {{{setdefaultparameters
+        def setdefaultparameters(self): # {{{
                 return self
         #}}}
-
         def checkconsistency(self,md,solution,analyses):    # {{{
                 if DiagnosticHorizAnalysisEnum() in analyses:
@@ -86 +77 @@
                 return md
         # }}}
-
         def marshall(self,fid):    # {{{
                 WriteData(fid,'data',self.vx,'format','DoubleMat','mattype',1,'enum',VxEnum())
@@ -97 +87 @@
                 WriteData(fid,'data',self.sediment_head,'format','DoubleMat','mattype',1,'enum',SedimentHeadEnum())
         # }}}
-