Changeset 26486

Timestamp:

10/18/21 12:20:35 (3 years ago)

Author:

jdquinn

Message:

CHG: MATLAB -> Python; clean up

Location:

issm/trunk-jpl/src/m/classes

Files:

• SMBautoregression.m (modified) (3 diffs)
• SMBautoregression.py (added)
• SMBcomponents.m (modified) (1 diff)
• SMBcomponents.py (modified) (1 diff)

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

@@ -13 +13 @@
                 ar_timestep       = 0;
                 phi               = NaN;
-                covmat            = NaN;        
+                covmat            = NaN;
                 basin_id          = NaN;
                 randomflag        = 1;
@@ -43 +43 @@
                                 self.ar_order = 1; %dummy 1 value for autoregression
                                 self.phi      = zeros(self.num_basins,self.ar_order); %autoregression coefficients all set to 0 
-                                disp('      smb.ar_order (order of autoregressive model) not specified: order of autoregressive model set to 0');       
+                                disp('      smb.ar_order (order of autoregressive model) not specified: order of autoregressive model set to 0');
                         end
                         if (self.ar_initialtime==0)
                                 self.ar_initialtime = md.timestepping.start_time; %autoregression model has no prescribed initial time
-                                disp('      smb.ar_initialtime (initial time in the autoregressive model parameterization) not specified: set to md.timestepping.start_time');  
+                                disp('      smb.ar_initialtime (initial time in the autoregressive model parameterization) not specified: set to md.timestepping.start_time');
                         end
                         if (self.ar_timestep==0)
                                 self.ar_timestep = md.timestepping.time_step; %autoregression model has no prescribed time step
-                                disp('      smb.ar_timestep (timestep of autoregressive model) not specified: set to md.timestepping.time_step');       
+                                disp('      smb.ar_timestep (timestep of autoregressive model) not specified: set to md.timestepping.time_step');
                         end
                         if isnan(self.phi)
@@ -114 +114 @@
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','ar_timestep','format','Double','scale',yts);
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','basin_id','data',self.basin_id-1,'name','md.smb.basin_id','format','IntMat','mattype',2); %0-indexed
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','beta0','format','DoubleMat','name','md.smb.beta0','scale',1./yts,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','beta1','format','DoubleMat','name','md.smb.beta1','scale',1./(yts^2),'yts',md.constants.yts);
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','phi','format','DoubleMat','name','md.smb.phi','yts',md.constants.yts); 
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','covmat','format','DoubleMat','name','md.smb.covmat','scale',1./(yts^2),'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','beta0','format','DoubleMat','name','md.smb.beta0','scale',1./yts,'yts',yts);
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','beta1','format','DoubleMat','name','md.smb.beta1','scale',1./(yts^2),'yts',yts);
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','phi','format','DoubleMat','name','md.smb.phi','yts',yts); 
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','covmat','format','DoubleMat','name','md.smb.covmat','scale',1./(yts^2),'yts',yts);
                         WriteData(fid,prefix,'object',self,'class','smb','fieldname','randomflag','format','Boolean');
-                        WriteData(fid, prefix, 'object', self, 'fieldname', 'steps_per_step', 'format', 'Integer');
-                        WriteData(fid, prefix, 'object', self, 'fieldname', 'averaging', 'format', 'Integer');
+                        WriteData(fid,prefix,'object',self,'fieldname','steps_per_step','format','Integer');
+                        WriteData(fid,prefix,'object',self,'fieldname','averaging','format','Integer');
 
                         %process requested outputs

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

@@ -83 +83 @@
 
                         WriteData(fid,prefix,'name','md.smb.model','data',2,'format','Integer');
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','accumulation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts);
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','runoff','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts);
+                        WriteData(fid,prefix,'object',self,'class','smb','fieldname','evaporation','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts);
                         WriteData(fid, prefix, 'object', self, 'fieldname', 'steps_per_step', 'format', 'Integer');
                         WriteData(fid, prefix, 'object', self, 'fieldname', 'averaging', 'format', 'Integer');

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

@@ -61 +61 @@
         if np.all(np.isnan(self.evaporation)):
             self.evaporation = np.zeros((md.mesh.numberofvertices))
-            print("      no SMB.evaporation specified: values set as zero")
+            print('      no SMB.evaporation specified: values set as zero')
         if np.all(np.isnan(self.runoff)):
             self.runoff = np.zeros((md.mesh.numberofvertices))
-            print("      no SMB.runoff specified: values set as zero")
+            print('      no SMB.runoff specified: values set as zero')
         return self
     # }}}