Changeset 23670 for issm/trunk-jpl/src/py3/classes/SMBforcing.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/SMBforcing.py (modified) (5 diffs)

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

@@ -1 @@
-import numpy
+import numpy as np
 from fielddisplay import fielddisplay
-from EnumDefinitions import *
 from checkfield import checkfield
 from WriteData import WriteData
@@ -34 +33 @@
         def initialize(self,md): # {{{
 
-                if numpy.all(numpy.isnan(self.mass_balance)):
-                        self.mass_balance=numpy.zeros((md.mesh.numberofvertices,1))
+                if np.all(np.isnan(self.mass_balance)):
+                        self.mass_balance=np.zeros((md.mesh.numberofvertices))
                         print("      no SMBforcing.mass_balance specified: values set as zero")
 
@@ -42 +41 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
 
-                if MasstransportAnalysisEnum() in analyses:
+                if 'MasstransportAnalysis' in analyses:
                         md = checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1,'Inf',1)
 
-                if BalancethicknessAnalysisEnum() in analyses:
+                if 'BalancethicknessAnalysis' in analyses:
                         md = checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices],'NaN',1,'Inf',1)
 
@@ -51 +50 @@
                 return md
         # }}}
-        def marshall(self,md,fid):    # {{{
+        def marshall(self,prefix,md,fid):    # {{{
 
-                yts=365.0*24.0*3600.0
+                yts=md.constants.yts
 
-                WriteData(fid,'enum',SmbEnum(),'data',SMBforcingEnum(),'format','Integer');
-                WriteData(fid,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
+                WriteData(fid,prefix,'name','md.smb.model','data',1,'format','Integer');
+                WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
+                #WriteData(fid,prefix,'object',self,'class','smb','fieldname','mass_balance','format','CompressedMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                 
                 #process requested outputs
@@ -64 +64 @@
                         outputscopy=outputs[0:max(0,indices[0]-1)]+self.defaultoutputs(md)+outputs[indices[0]+1:]
                         outputs    =outputscopy
-                WriteData(fid,'data',outputs,'enum',SmbRequestedOutputsEnum(),'format','StringArray')
+                WriteData(fid,prefix,'data',outputs,'name','md.smb.requested_outputs','format','StringArray')
 
         # }}}