Changeset 24240 for issm/trunk-jpl/src/m/classes/SMBforcing.m

Timestamp:

10/17/19 06:03:43 (5 years ago)

Author:

bdef

Message:

Adding a substeping framework in hydro and part of smb

File:

• issm/trunk-jpl/src/m/classes/SMBforcing.m (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/SMBforcing.m ¶

@@ -5 +5 @@
 
 classdef SMBforcing
-        properties (SetAccess=public) 
-                isclimatology = 0;
-                mass_balance = NaN;
-                requested_outputs      = {};
+        properties (SetAccess=public)
+                isclimatology     = 0;
+                mass_balance      = NaN;
+                steps_per_step    = 1;
+                requested_outputs = {};
         end
         methods
@@ -57 +58 @@
                                 md = checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices 1],'NaN',1,'Inf',1);
                         end
+                        md = checkfield(md,'fieldname','smb.steps_per_step','>=',1,'numel',[1]);
                         md = checkfield(md,'fieldname','smb.requested_outputs','stringrow',1);
                         md = checkfield(md,'fieldname','smb.isclimatology','values',[0 1]);
                         if (self.isclimatology)
                                 md = checkfield(md,'fieldname', 'smb.mass_balance', 'size',[md.mesh.numberofvertices+1],...
-                                        'message',['mass_balance must have md.mesh.numberofvertices+1 rows in order to force a climatology']);
+                                                'message',['mass_balance must have md.mesh.numberofvertices+1 rows in order to force a climatology']);
                         end
                 end % }}}
@@ -68 +70 @@
                         fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]');
                         fielddisplay(self,'isclimatology','repeat all forcings when past last forcing time (default false)');
+                        fielddisplay(self, 'steps_per_step', 'number of smb steps per time step');
                         fielddisplay(self,'requested_outputs','additional outputs requested');
                 end % }}}
@@ -77 +80 @@
                         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);
-                        
+                        WriteData(fid, prefix, 'object', self, 'fieldname', 'steps_per_step', 'format', 'Integer');
+
                         %process requested outputs
                         outputs = self.requested_outputs;
@@ -90 +94 @@
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                
+
                         writejs1Darray(fid,[modelname '.smb.mass_balance'],self.mass_balance);
                         writejscellstring(fid,[modelname '.smb.requested_outputs'],self.requested_outputs);