Changeset 27135

Timestamp:

07/01/22 17:31:26 (3 years ago)

Author:

Eric.Larour

Message:

CHG: fixed issues with timeseries!

Location:

issm/branches/trunk-larour-SLPS2022/src/m/classes

Files:

• mask.m (modified) (3 diffs)
• mmemasstransport.m (modified) (2 diffs)

issm/branches/trunk-larour-SLPS2022/src/m/classes/mask.m ¶

@@ -86 +86 @@
                                 for i=1:length(self.ocean_levelset),
                                         md = checkfield(md,'field',self.ocean_levelset{i},'NaN',0,'Inf',1,'timeserieslength',1,'Inf',1);
-                                        %check time stamps: they should be in seconds 
-                                        h=self.ocean_levelset{i};
-                                        times=h(end,:);
-                                        avgtime=mean(times);
-                                        if(avgtime<10000)
-                                                error('mask checkconsistency error messages: time tags for ocean_levelset should be in seconds!');
-                                        end
                                 end
                         else
@@ -101 +94 @@
                                 for i=1:length(self.ice_levelset),
                                         md = checkfield(md,'field',self.ice_levelset{i},'NaN',0,'Inf',1,'timeserieslength',1,'Inf',1);
-                                        %check time stamps: they should be in seconds 
-                                        h=self.ice_levelset{i};
-                                        times=h(end,:);
-                                        avgtime=mean(times);
-                                        if(avgtime<10000)
-                                                error('mask checkconsistency error messages: time tags for ice_levelset should be in seconds!');
-                                        end
                                 end
                         else
@@ -120 +106 @@
 
                         if isa(self.ocean_levelset,'cell'),
-                                WriteData(fid,prefix,'object',self,'fieldname','ocean_levelset','name','md.mask.ocean_levelset','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                                WriteData(fid,prefix,'object',self,'fieldname','ocean_levelset','name','md.mask.ocean_levelset','format','MatArray','timeseries',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         else
-                                WriteData(fid,prefix,'object',self,'fieldname','ocean_levelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                                WriteData(fid,prefix,'object',self,'fieldname','ocean_levelset','format','DoubleMat','mattype',1,'timeseries',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         end
 
                         if isa(self.ice_levelset,'cell'),
-                                WriteData(fid,prefix,'object',self,'fieldname','ice_levelset','name','md.mask.ice_levelset','format','MatArray','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                                WriteData(fid,prefix,'object',self,'fieldname','ice_levelset','name','md.mask.ice_levelset','format','MatArray','timeseries',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         else
-                                WriteData(fid,prefix,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                                WriteData(fid,prefix,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1,'timeseries',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         end
                 end % }}}

issm/branches/trunk-larour-SLPS2022/src/m/classes/mmemasstransport.m ¶

@@ -57 +57 @@
                         md = checkfield(md,'fieldname','mmemasstransport.requested_outputs','stringrow',1);
 
-                        %check time stamps: they should be in seconds 
-                        for i=1:nt, 
-                                h=self.thickness{i};
-                                times=h(end,:);
-                                avgtime=mean(times);
-                                if(avgtime<10000)
-                                        error('mmemasstransport checkconsistency error messages: time tags for thicknesses should be in seconds!');
-                                end
-                        end
                 end % }}}
                 function disp(self) % {{{
@@ -81 +72 @@
                         WriteData(fid,prefix,'object',self,'fieldname','ids','format','DoubleMat','mattype',3);
                         WriteData(fid,prefix,'object',self,'fieldname','partition','format','DoubleMat','mattype',1);
-                        WriteData(fid,prefix,'object',self,'fieldname','thickness','format','MatArray','timeseries',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','thickness','format','MatArray','timeseries',1,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
 
                         %process requested outputs