Changeset 15396 for issm/trunk/src/m/classes/model/model.py

Timestamp:

07/02/13 09:24:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 15394

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/model/model.py (modified) (15 diffs)

issm/trunk

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache

issm/trunk/src/m/classes/model/model.py

@@ -18 +18 @@
 from verbose import verbose
 from settings import settings
-from solver import solver
+from toolkits import toolkits
 from generic import generic
 from balancethickness import balancethickness
 from diagnostic import diagnostic
 from groundingline import groundingline
-from hydrology import hydrology
+from hydrologyshreve import hydrologyshreve
 from prognostic import prognostic
 from thermal import thermal
 from steadystate import steadystate
 from transient import transient
+from gia import gia
 from autodiff import autodiff
 from flaim import flaim
@@ -50 +51 @@
 class model(object):
         #properties
-        def __init__(self):
-                # {{{ Properties
+        def __init__(self):#{{{
                 self.mesh             = mesh()
                 self.mask             = mask()
@@ -66 +66 @@
 
                 self.debug            = debug()
-                self.verbose          = verbose('solution',True,'qmu',True,'control',True)
+                self.verbose          = verbose()
                 self.settings         = settings()
-                self.solver           = solver()
-                if ismumps():
-                        self.solver.addoptions(DiagnosticVertAnalysisEnum(),mumpsoptions())
-                else:
-                        self.solver.addoptions(DiagnosticVertAnalysisEnum(),iluasmoptions())
+                self.toolkits         = toolkits()
                 self.cluster          = generic()
 
@@ -78 +74 @@
                 self.diagnostic       = diagnostic()
                 self.groundingline    = groundingline()
-                self.hydrology        = hydrology()
+                self.hydrology        = hydrologyshreve()
                 self.prognostic       = prognostic()
                 self.thermal          = thermal()
                 self.steadystate      = steadystate()
                 self.transient        = transient()
+                self.gia              = gia()
 
                 self.autodiff         = autodiff()
@@ -94 +91 @@
                 self.private          = private()
                 #}}}
-
         def properties(self):    # {{{
                 # ordered list of properties since vars(self) is random
@@ -112 +108 @@
                         'verbose',\
                         'settings',\
-                        'solver',\
+                        'toolkits',\
                         'cluster',\
                         'balancethickness',\
@@ -122 +118 @@
                         'steadystate',\
                         'transient',\
+                                  'gia',\
                         'autodiff',\
                         'flaim',\
@@ -131 +128 @@
                         'private']
         # }}}
-
-        def __repr__(obj):
-                # {{{ Display
-
+        def __repr__(obj): #{{{
                 #print "Here %s the number: %d" % ("is", 37)
                 string="%19s: %-22s -- %s" % ("mesh","[%s,%s]" % ("1x1",obj.mesh.__class__.__name__),"mesh properties")
@@ -151 +145 @@
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("verbose","[%s,%s]" % ("1x1",obj.verbose.__class__.__name__),"verbosity level in solve"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("settings","[%s,%s]" % ("1x1",obj.settings.__class__.__name__),"settings properties"))
-                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("solver","[%s,%s]" % ("1x1",obj.solver.__class__.__name__),"PETSc options for each solution"))
+                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("toolkits","[%s,%s]" % ("1x1",obj.toolkits.__class__.__name__),"PETSc options for each solution"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("cluster","[%s,%s]" % ("1x1",obj.cluster.__class__.__name__),"cluster parameters (number of cpus...)"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("balancethickness","[%s,%s]" % ("1x1",obj.balancethickness.__class__.__name__),"parameters for balancethickness solution"))
@@ -170 +164 @@
                 return string
         # }}}
-
         def checkmessage(self,string):    # {{{
                 print ("model not consistent: %s" % string)
@@ -176 +169 @@
                 return self
         # }}}
-
         def extract(md,area):    # {{{
                 """
@@ -450 +442 @@
                 return md2
         # }}}
-
         def extrude(md,*args):    # {{{
                 """
@@ -634 +625 @@
                 md.balancethickness.spcthickness=project3d(md,'vector',md.balancethickness.spcthickness,'type','node')
                 md.diagnostic.referential=project3d(md,'vector',md.diagnostic.referential,'type','node')
+                md.diagnostic.loadingforce=project3d(md,'vector',md.diagnostic.loadingforce,'type','node')
 
                 #in 3d, pressureload: [node1 node2 node3 node4 element]
@@ -657 +649 @@
                 md.geometry.surface=project3d(md,'vector',md.geometry.surface,'type','node')
                 md.geometry.thickness=project3d(md,'vector',md.geometry.thickness,'type','node')
+                md.gia.mantle_viscosity=project3d(md,'vector',md.gia.mantle_viscosity,'type','node')
+                md.gia.lithosphere_thickness=project3d(md,'vector',md.gia.lithosphere_thickness,'type','node')
                 md.geometry.hydrostatic_ratio=project3d(md,'vector',md.geometry.hydrostatic_ratio,'type','node')
                 md.geometry.bed=project3d(md,'vector',md.geometry.bed,'type','node')
@@ -697 +691 @@
                 return md
                 # }}}
-

@@ +1 @@
+par
+ad
+proj-*
 projects
 autom4te.cache