Changeset 12946 for issm/branches/trunk-jpl-damage/src/m/classes/private.py

Timestamp:

08/08/12 14:38:52 (13 years ago)

Author:

cborstad

Message:

CHG: merged trunk-jpl into branch through revision 12945

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (1 prop)
• src/m/classes/private.py (modified) (2 diffs)

issm/branches/trunk-jpl-damage/src/m/classes/private.py

@@ -6 +6 @@
         def __init__(self):
                 # {{{ Properties
-                self.runtimename = ''
-                self.bamg        = {}
-                self.solution    = '';
+                self.isconsistent = True;
+                self.runtimename  = ''
+                self.bamg         = {}
+                self.solution     = '';
 
                 #set defaults
@@ -17 +18 @@
                 # {{{ Display
                 string='   private parameters: do not change'
+
+                string="%s\n%s"%(string,fielddisplay(obj,'isconsistent','is model self consistent'))
                 string="%s\n%s"%(string,fielddisplay(obj,'runtimename','name of the run launched'))
-                string="%s\n%s"%(string,fielddisplay(obj,'bamg','structure with mesh properties construced if bamg is used to mesh the domain'))
+                string="%s\n%s"%(string,fielddisplay(obj,'bamg','structure with mesh properties constructed if bamg is used to mesh the domain'))
                 string="%s\n%s"%(string,fielddisplay(obj,'solution','type of solution launched'))
                 return string