Changeset 21341 for issm/trunk/src/m/classes/SMBforcing.m

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/SMBforcing.m (modified) (3 diffs)

issm/trunk/src/m/classes/SMBforcing.m

@@ -48 +48 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                        if (solution==TransientSolutionEnum & md.transient.issmb == 0), return; end
+                        if (strcmp(solution,'TransientSolution') & md.transient.issmb == 0), return; end
                         
-                        if ismember(MasstransportAnalysisEnum(),analyses),
+                        if ismember('MasstransportAnalysis',analyses),
                                 md = checkfield(md,'fieldname','smb.mass_balance','timeseries',1,'NaN',1,'Inf',1);
                         end
-                        if ismember(BalancethicknessAnalysisEnum(),analyses),
+                        if ismember('BalancethicknessAnalysis',analyses),
                                 md = checkfield(md,'fieldname','smb.mass_balance','size',[md.mesh.numberofvertices 1],'NaN',1,'Inf',1);
                         end
@@ -63 +63 @@
                         fielddisplay(self,'requested_outputs','additional outputs requested');
                 end % }}}
-                function marshall(self,md,fid) % {{{
+                function 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);
                         
                         %process requested outputs
@@ -77 +77 @@
                                 outputs      = [outputs defaultoutputs(self,md)]; %add defaults
                         end
-                        WriteData(fid,'data',outputs,'enum',SmbRequestedOutputsEnum,'format','StringArray');
+                        WriteData(fid,prefix,'data',outputs,'name','md.smb.requested_outputs','format','StringArray');
 
                 end % }}}