Changeset 14825

Timestamp:

04/30/13 19:27:50 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added gia to python model and fixed consistency of gia

Location:

issm/trunk-jpl/src/m/classes

Files:

• gia.m (modified) (1 diff)
• gia.py (modified) (1 diff)
• model/model.py (modified) (10 diffs)

issm/trunk-jpl/src/m/classes/gia.m

@@ -32 +32 @@
                         %be sure that if we are running a prognostic ice flow model coupled with gia, that thickness forcings 
                         %are not provided into the future.
-                        if md.transient.isprognostic,
-                                thickness=md.geometry.thickness; 
+                        if solution==TransientSolutionEnum() & md.transient.isprognostic & md.transient.isgia,
                                 %figure out if thickness is a transient forcing: 
-                                s=size(thickness); 
-                                if s(1)>=md.mesh.numberofvertices,
+                                if size(md.geometry.thickness,1)==md.mesh.numberofvertices+1,
                                         %recover the furthest time "in time": 
-                                        time=thickness(end,end);
-                                        if(time~=md.timestepping.start_time),
-                                                error('if isprognostic is on, transient thickness forcing for the gia model should not be provided in the future. Synchronize your start_time to correspond to the most recent transient thickness forcing timestep');
+                                        if(thickness(end,end)~=md.timestepping.start_time),
+                                                md = checkmessage(md,'if isprognostic is on, transient thickness forcing'...
+                                                        ' for the gia model should not be provided in the future.'...
+                                                        ' Synchronize your start_time to correspond to the most recent transient'...
+                                                        ' thickness forcing timestep');
                                         end
                                 end

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

@@ -49 +49 @@
                 #be sure that if we are running a prognostic ice flow model coupled with gia, that thickness forcings 
                 #are not provided into the future.
-                if md.transient.isprognostic:
-                        thickness=md.geometry.thickness 
-                        #figure out if thickness is a transient forcing: 
-                        s=size(thickness)
-                        if s(1)>=md.mesh.numberofvertices:
-                                #recover the furthest time "in time": 
-                                time=thickness(end,end)
-                                if not time==md.timestepping.start_time:
-                                        raise RunetimeError("if isprognostic is on, transient thickness forcing for the gia model should not be provided in the future. Synchronize your start_time to correspond to the most recent transient thickness forcing timestep")
 
                 return md

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

@@ -28 +28 @@
 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()
@@ -79 +79 @@
                 self.steadystate      = steadystate()
                 self.transient        = transient()
+                self.gia              = gia()
 
                 self.autodiff         = autodiff()
@@ -90 +91 @@
                 self.private          = private()
                 #}}}
-
         def properties(self):    # {{{
                 # ordered list of properties since vars(self) is random
@@ -127 +127 @@
                         '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")
@@ -166 +163 @@
                 return string
         # }}}
-
         def checkmessage(self,string):    # {{{
                 print ("model not consistent: %s" % string)
@@ -172 +168 @@
                 return self
         # }}}
-
         def extract(md,area):    # {{{
                 """
@@ -446 +441 @@
                 return md2
         # }}}
-
         def extrude(md,*args):    # {{{
                 """
@@ -654 +648 @@
                 md.geometry.surface=project3d(md,'vector',md.geometry.surface,'type','node')
                 md.geometry.thickness=project3d(md,'vector',md.geometry.thickness,'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')
@@ -694 +689 @@
                 return md
                 # }}}
-