Changeset 18766

Timestamp:

11/10/14 08:36:15 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed extrusion of calving parameters in python

Location:

issm/trunk-jpl/src/m/classes

Files:

• calving.py (modified) (1 diff)
• calvinglevermann.m (modified) (2 diffs)
• calvinglevermann.py (added)
• model.py (modified) (2 diffs)

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

@@ -26 +26 @@
                 return string
                 #}}}
-        def defaultoutputs(self,md): # {{{
-
-                return []
-
-        #}}}
         def setdefaultparameters(self): # {{{
 

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

@@ -6 +6 @@
 classdef calvinglevermann
         properties (SetAccess=public) 
-                 coeff                  = 0;
+                 coeff = NaN;
         end
         methods
@@ -37 +37 @@
                 end % }}}
                 function disp(obj) % {{{
-                        disp(sprintf('   Calving parameters:'));
+                        disp(sprintf('   Calving Levermann parameters:'));
                         fielddisplay(obj,'coeff','proportionality coefficient in Levermann model');
 

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

@@ -16 +16 @@
 from matice import matice
 from calving import calving
+from calvinglevermann import calvinglevermann
 from damage import damage
 from friction import friction
@@ -664 +665 @@
 
                 # Calving variables
-                if hasattr(md.calving,'calving'):
+                if isinstance(md.calving,calving):
                         md.calving.calvingrate=project3d(md,'vector',md.calving.calvingrate,'type','node')
-                if hasattr(md.calving,'calvinglevermann'):
+                if isinstance(md.calving,calvinglevermann):
                         md.calving.coeff=project3d(md,'vector',md.calving.coeff,'type','node')