Changeset 23670 for issm/trunk-jpl/src/py3/classes/steadystate.py

Timestamp:

01/31/19 07:34:11 (6 years ago)

Author:

bdef

Message:

CHG: python scripts after 2to3 and indentation fix

File:

• issm/trunk-jpl/src/py3/classes/steadystate.py (modified) (5 diffs)

issm/trunk-jpl/src/py3/classes/steadystate.py

@@ -1 @@
-import numpy
+import numpy as np
 from fielddisplay import fielddisplay
-from EnumDefinitions import *
 from checkfield import checkfield
 from WriteData import WriteData
@@ -49 +48 @@
 
                 #Early return
-                if not solution==SteadystateSolutionEnum():
+                if not solution=='SteadystateSolution':
                         return md
 
@@ -55 +54 @@
                         md.checkmessage("for a steadystate computation, timestepping.time_step must be zero.")
 
-                if numpy.isnan(md.stressbalance.reltol):
+                if np.isnan(md.stressbalance.reltol):
                         md.checkmessage("for a steadystate computation, stressbalance.reltol (relative convergence criterion) must be defined!")
 
@@ -62 +61 @@
                 return md
         # }}}
-        def marshall(self,md,fid):    # {{{
-                WriteData(fid,'object',self,'fieldname','reltol','format','Double')
-                WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
+        def marshall(self,prefix,md,fid):    # {{{
+                WriteData(fid,prefix,'object',self,'fieldname','reltol','format','Double')
+                WriteData(fid,prefix,'object',self,'fieldname','maxiter','format','Integer')
 
                 #process requested outputs
@@ -72 +71 @@
                         outputscopy=outputs[0:max(0,indices[0]-1)]+self.defaultoutputs(md)+outputs[indices[0]+1:]
                         outputs    =outputscopy
-                WriteData(fid,'data',outputs,'enum',SteadystateRequestedOutputsEnum(),'format','StringArray')
+                WriteData(fid,prefix,'data',outputs,'name','md.steadystate.requested_outputs','format','StringArray')
         # }}}