Changeset 21158

Timestamp:

08/24/16 15:13:51 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: do NOT allow ice levelset to be a time series, use md.levelset.spc instead (because MaskActiveNodes is set at t=0 and transient changes the time to t+dt, for which the mask needs to be updated)

File:

• issm/trunk-jpl/src/m/classes/mask.m (modified) (2 diffs)

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

@@ -40 +40 @@
 
                         md = checkfield(md,'fieldname','mask.groundedice_levelset','forcing',1,'NaN',1);
-                        md = checkfield(md,'fieldname','mask.ice_levelset','forcing',1,'NaN',1);
+                        md = checkfield(md,'fieldname','mask.ice_levelset','NaN',1,'size',[md.mesh.numberofvertices 1]);
                         isice=(md.mask.ice_levelset<=0);
                         if sum(isice)==0,
@@ -57 +57 @@
                 function marshall(self,prefix,md,fid) % {{{
                         WriteData(fid,prefix,'object',self,'fieldname','groundedice_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,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{