Changeset 14640 for issm/trunk-jpl/src/m/classes/prognostic.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/prognostic.py (modified) (6 diffs)

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

@@ -1 @@
-#module imports
 from fielddisplay import fielddisplay
 from EnumDefinitions import *
@@ -14 +13 @@
         """
 
-        #properties
-        def __init__(self):
-                # {{{ Properties
+        def __init__(self): # {{{
                 self.spcthickness           = float('NaN')
                 self.min_thickness          = 0
@@ -29 +26 @@
 
                 #}}}
-        def __repr__(self):
-                # {{{ Display
+        def __repr__(self): # {{{
                 string='   Prognostic solution parameters:'
-                string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)'))
-                string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed'))
+                string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]'))
+                string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed [m]'))
                 string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' '))
-                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0->no, 1->artificial_diffusivity, 2->streamline upwinding, 3->discontinuous Galerkin'))
+                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin'))
                 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested'))
 
                 return string
                 #}}}
-                
-        def setdefaultparameters(self):
-                # {{{setdefaultparameters
+        def setdefaultparameters(self): # {{{
                 
                 #Type of stabilization to use 0:nothing 1:artificial_diffusivity 3:Discontinuous Galerkin
@@ -58 +52 @@
                 return self
         #}}}
-
         def checkconsistency(self,md,solution,analyses):    # {{{
 
@@ -74 +67 @@
                 return md
         # }}}
-
         def marshall(self,fid):    # {{{
                 WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1)
@@ -84 +76 @@
                 WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
         # }}}
-