Changeset 11794

Timestamp:

03/25/12 11:12:41 (13 years ago)

Author:

Eric.Larour

Message:

New classes in python

Location:

issm/trunk-jpl/src/py

Files:

• classes/autodiff.py (added)
• classes/flaim.py (added)
• classes/groundingline.py (added)
• classes/hydrology.py (added)
• classes/inversion.py (added)
• classes/model.py (modified) (2 diffs)
• classes/prognostic.py (added)
• classes/steadystate.py (added)
• classes/thermal.py (added)
• classes/transient.py (added)
• model/display/fielddisplay.py (modified) (2 diffs)

issm/trunk-jpl/src/py/classes/model.py

@@ -19 +19 @@
 from balancethickness import balancethickness
 from diagnostic import diagnostic
+from groundingline import groundingline
+from hydrology import hydrology
+from prognostic import prognostic
+from thermal import thermal
+from steadystate import steadystate
+from transient import transient
+from autodiff import autodiff
+from flaim import flaim
+from inversion import inversion
 #}}}
 class model:
@@ -45 +54 @@
                 self.balancethickness = balancethickness()
                 self.diagnostic       = diagnostic()
-                self.groundingline    = [];
-                self.hydrology        = [];
-                self.prognostic       = [];
-                self.thermal          = [];
-                self.steadystate      = [];
-                self.transient        = [];
+                self.groundingline    = groundingline()
+                self.hydrology        = hydrology()
+                self.prognostic       = prognostic()
+                self.thermal          = thermal()
+                self.steadystate      = steadystate()
+                self.transient        = transient()
 
-                self.autodiff         = [];
-                self.flaim            = [];
-                self.inversion        = [];
+                self.autodiff         = autodiff()
+                self.flaim            = flaim()
+                self.inversion        = inversion()
                 self.qmu              = [];
 

issm/trunk-jpl/src/py/model/display/fielddisplay.py

@@ -43 +43 @@
                         string=displayunit(offset,name,"false",comment)
                 
-        #elif isstruct(field),
-        #       if ~isempty(fields(field))
-        #               displayunit(offset,name,'(structure)',comment),
-        #               struct_display(field,[offset '   ']),
-        #       else
-        #               displayunit(offset,name,'N/A',comment),
-        #       end
-
+        elif isinstance(field,list):
+                if not field:
+                        string=displayunit(offset,name,'N/A',comment),
+                else:
+                        string=displayunit(offset,name,'(structure)',comment)
+                        for i in range(len(field)):
+                                string="%s\n%s"%(string,displayunit(offset + '   ',name,field[i],comment))
         #cell
         #elif  iscell(field):
@@ -86 +85 @@
                         string="%s%-23s: %-15s -- %s" % (offset,name,characterization,comment)
                 elif isinstance(comment,list):
+                        print(comment)
                         string="%s%-23s: %-15s -- %s" % (offset,name,characterization,comment[0])
-                        for i in range(2,len(comment)):
+                        for i in range(1,len(comment)):
                                 string2="%s%-23s  %-15s    %s" %(offset,"","",comment[i])
-                                string="%s%s"%(string,string2)
+                                string="%s\n%s"%(string,string2)
                 else:
                         raise RuntimeError("fielddisplay error message: format for comment not supportet yet")