Changeset 20322

Timestamp:

03/18/16 09:04:47 (9 years ago)

Author:

Eric.Larour

Message:

CHG: slr: check against the mask to ensure conservation of mass.

model: additional checks.

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.m (modified) (1 diff)
• slr.m (modified) (3 diffs)

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

@@ -513 +513 @@
 
                         %recreate segments
-                        if isa(md1.mesh,'mesh2d'),
+                        if isa(md1.mesh,'mesh2d') | isa(md1.mesh','mesh3dsurface'),
                                 md2.mesh.vertexconnectivity=NodeConnectivity(md2.mesh.elements,md2.mesh.numberofvertices);
                                 md2.mesh.elementconnectivity=ElementConnectivity(md2.mesh.elements,md2.mesh.vertexconnectivity);

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

@@ -56 +56 @@
 
                         if ~ismember(SealevelriseAnalysisEnum(),analyses), return; end
-                        md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofelements 1]);
+                        %md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','slr.love_h','NaN',1,'Inf',1);
@@ -69 +70 @@
                         if (size(self.love_h,1) ~= size(self.love_k,1)),
                                 error('slr error message: love numbers should be provided at the same level of accuracy');
+                        end
+
+                        %cross check that whereever we have an ice load, the mask is <0 on each vertex: 
+                        pos=find(self.deltathickness);
+                        maskpos=md.mask.ice_levelset(md.mesh.elements(pos,:)); 
+                        [els,vertices]=find(maskpos>0);
+                        if length(els),
+                                error('slr checkconsistency fail: there are elements with ice loads where some vertices are not on the ice!');
                         end
 
@@ -94 +103 @@
                 end % }}}
                 function marshall(self,md,fid) % {{{
-                        WriteData(fid,'object',self,'class','sealevelrise','fieldname','deltathickness','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',self,'class','sealevelrise','fieldname','deltathickness','format','DoubleMat','mattype',2);
+                        %WriteData(fid,'object',self,'class','sealevelrise','fieldname','deltathickness','format','DoubleMat','mattype',1);
                         WriteData(fid,'data',self.sealevel,'mattype',1,'format','DoubleMat','enum',SealevelEnum(),'timeserieslength',md.mesh.numberofvertices+1);
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','reltol','format','Double');