Changeset 22157

Timestamp:

10/09/17 19:13:51 (7 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

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

Files:

• mask.m (modified) (1 diff)
• maskpsl.m (modified) (1 diff)
• sealevelmodel.m (modified) (1 diff)

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/mask.m

@@ -56 +56 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
+                        WriteData(fid,prefix,'name','md.mask.type','data',class(md.mask),'format','String');
                         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);

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/maskpsl.m

@@ -68 +68 @@
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{
+                        WriteData(fid,prefix,'name','md.mask.type','data',class(md.mask),'format','String');
                         WriteData(fid,prefix,'object',self,'class','mask','fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'class','mask','fieldname','ice_levelset','format','DoubleMat','mattype',1);

issm/branches/trunk-larour-NatGeoScience2016/src/m/classes/sealevelmodel.m

@@ -66 +66 @@
                         end
 
-
-
+                        %make sure steric_rate is the same everywhere: 
+                        for i=1:length(slm.icecaps),
+                                md= slm.icecaps{i}; 
+                                if ~isempty(find(md.slr.steric_rate - slm.earth.slr.steric_rate(slm.earth.slr.transitions{i}))),
+                                        error(sprintf('steric rate on ice cap %s is not the same as for the earth\n',md.miscellaneous.name));
+                                end
+                        end
 
                 end