Changeset 14543

Timestamp:

04/11/13 15:26:44 (12 years ago)

Author:

seroussi

Message:

FIX: added isgia in transient class

Location:

issm/trunk-jpl/src/m/classes

Files:

• transient.m (modified) (5 diffs)
• transient.py (modified) (5 diffs)

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

@@ -10 +10 @@
                 isthermal         = 0;
                 isgroundingline   = 0;
+                isgia             = 0;
                 requested_outputs = NaN;
         end
@@ -28 +29 @@
                         obj.isthermal=1;
                         obj.isgroundingline=0;
+                        obj.isgia=0;
 
                 end % }}}
@@ -39 +41 @@
                         md = checkfield(md,'transient.isthermal','numel',[1],'values',[0 1]);
                         md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'transient.isgia','numel',[1],'values',[0 1]);
                         md = checkfield(md,'transient.requested_outputs','size',[NaN 1]);
 
@@ -49 +52 @@
                         fielddisplay(obj,'isthermal','indicates if a thermal solution is used in the transient');
                         fielddisplay(obj,'isgroundingline','indicates if a groundingline migration is used in the transient');
+                        fielddisplay(obj,'isgia','indicates if a postglacial rebound model is used in the transient');
                         fielddisplay(obj,'requested_outputs','list of additional outputs requested');
 
@@ -57 +61 @@
                         WriteData(fid,'object',obj,'fieldname','isthermal','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isgroundingline','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
                 end % }}}

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

@@ -20 +20 @@
                 self.isthermal         = False
                 self.isgroundingline   = False
+                self.isgia             = False
                 self.requested_outputs = float('NaN')
 
@@ -33 +34 @@
                 string="%s\n%s"%(string,fielddisplay(self,'isthermal','indicates if a thermal solution is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'isgroundingline','indicates if a groundingline migration is used in the transient'))
+                string="%s\n%s"%(string,fielddisplay(self,'isgia','indicates if a postglacial rebound is used in the transient'))
                 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','list of additional outputs requested'))
                 return string
@@ -45 +47 @@
                 self.isthermal=True
                 self.isgroundingline=False
+                self.isgia=False
 
                 return self
@@ -59 +62 @@
                 md = checkfield(md,'transient.isthermal','numel',[1],'values',[0,1])
                 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0,1])
+                md = checkfield(md,'transient.isgia','numel',[1],'values',[0,1])
                 md = checkfield(md,'transient.requested_outputs','size',[float('NaN')])
 
@@ -70 +74 @@
                 WriteData(fid,'object',self,'fieldname','isthermal','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','isgroundingline','format','Boolean')
+                WriteData(fid,'object',self,'fieldname','isgia','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3)
         # }}}