Changeset 17939

Timestamp:

05/05/14 16:48:28 (11 years ago)

Author:

cborstad

Message:

CHG: updated display for groundingline classes

Location:

issm/trunk-jpl/src/m/classes

Files:

• groundingline.m (modified) (1 diff)
• groundingline.py (modified) (1 diff)

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

@@ -45 +45 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
-                        md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration' 'SubelementMigration','SubelementMigration2' 'Contact'});
+                        md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'AgressiveMigration' 'SoftMigration' 'SubelementMigration' 'SubelementMigration2' 'Contact' 'None'});
 
                         if ~strcmp(obj.migration,'None'),

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

@@ -26 +26 @@
                 string='   grounding line migration parameters:'
 
-                string="%s\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None'''))
+                string="%s\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'',''SubelementMigration'',''SubelementMigration2'',''Contact'',''None'''))
                 string="%s\n%s"%(string,fielddisplay(self,'melting_rate','melting rate applied when previously grounded parts start floating [m/yr]'))
                 return string