Changeset 13443

Timestamp:

09/25/12 16:48:47 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: updated python version of prognostic.m so that NR works

Location:

issm/trunk-jpl/src/m/classes

Files:

• prognostic.m (modified) (1 diff)
• prognostic.py (modified) (4 diffs)

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

@@ -12 +12 @@
                  vertex_pairing         = NaN;
                  penalty_factor         = 0;
-                 requested_outputs       = NaN;
+                 requested_outputs      = NaN;
         end
         methods

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

@@ -23 +23 @@
                 self.vertex_pairing         = float('NaN')
                 self.penalty_factor         = 0
+                self.requested_outputs      = float('NaN')
 
                 #set defaults
@@ -35 +36 @@
                 string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' '))
                 string="%s\n%s"%(string,fielddisplay(self,'stabilization','0->no, 1->artificial_diffusivity, 2->streamline upwinding, 3->discontinuous Galerkin'))
+                string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested'))
 
                 return string
@@ -67 +69 @@
                 md = checkfield(md,'prognostic.stabilization','values',[0,1,2,3])
                 md = checkfield(md,'prognostic.min_thickness','>',0)
+                md = checkfield(md,'prognostic.requested_output','size',[float('NaN'),1])
 
                 return md
@@ -78 +81 @@
                 WriteData(fid,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3)
                 WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double')
+                WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
         # }}}