Changeset 16137 for issm/trunk/src/m/classes/mask.m

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/classes/mask.m (modified) (2 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

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

@@ -6 +6 @@
 classdef mask
         properties (SetAccess=public) 
-                elementonfloatingice = NaN;
-                elementongroundedice = NaN;
-                elementonwater       = NaN;
-                vertexonfloatingice  = NaN;
-                vertexongroundedice  = NaN;
-                vertexonwater        = NaN;
-                vertexonrock        = NaN;
+                groundedice_levelset = NaN;
+                ice_levelset         = NaN;
         end
         methods
@@ -28 +23 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
-                        md = checkfield(md,'mask.elementonfloatingice','size',[md.mesh.numberofelements 1],'values',[0 1]);
-                        md = checkfield(md,'mask.elementongroundedice','size',[md.mesh.numberofelements 1],'values',[0 1]);
-                        md = checkfield(md,'mask.elementonwater'      ,'size',[md.mesh.numberofelements 1],'values',[0 1]);
-                        md = checkfield(md,'mask.vertexonfloatingice','size',[md.mesh.numberofvertices 1],'values',[0 1]);
-                        md = checkfield(md,'mask.vertexongroundedice','size',[md.mesh.numberofvertices 1],'values',[0 1]);
-                        md = checkfield(md,'mask.vertexonwater'      ,'size',[md.mesh.numberofvertices 1],'values',[0 1]);
-                        %md = checkfield(md,'mask.vertexonrock'      ,'size',[md.mesh.numberofvertices 1],'values',[0 1]);
+                        md = checkfield(md,'mask.groundedice_levelset','size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'mask.ice_levelset'        ,'size',[md.mesh.numberofvertices 1]);
+                        isice=(md.mask.ice_levelset>0);
+                        if any(sum(isice(md.mesh.elements),2)==0),
+                                error('elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0');
+                        end
                 end % }}}
                 function disp(obj) % {{{
                         disp(sprintf('   masks:'));
 
-                        fielddisplay(obj,'elementonfloatingice','element on floating ice flags list');
-                        fielddisplay(obj,'vertexonfloatingice','vertex on floating ice flags list');
-                        fielddisplay(obj,'elementongroundedice','element on grounded ice  list');
-                        fielddisplay(obj,'vertexongroundedice','vertex on grounded ice flags list');
-                        fielddisplay(obj,'elementonwater','element on rock flags list');
-                        fielddisplay(obj,'vertexonwater','vertex on water flags list');
-                        fielddisplay(obj,'vertexonrock','vertex on rock flags list');
+                        fielddisplay(obj,'groundedice_levelset','is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0');
+                        fielddisplay(obj,'ice_levelset','presence of ice if > 0, icefront position if = 0, no ice if < 0');
                 end % }}}
                 function marshall(obj,md,fid) % {{{
-                        WriteData(fid,'object',obj,'fieldname','elementonfloatingice','format','BooleanMat','mattype',2);
-                        WriteData(fid,'object',obj,'fieldname','elementongroundedice','format','BooleanMat','mattype',2);
-                        WriteData(fid,'object',obj,'fieldname','elementonwater','format','BooleanMat','mattype',2);
-                        WriteData(fid,'object',obj,'fieldname','vertexonfloatingice','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','vertexongroundedice','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'fieldname','vertexonwater','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
+                        WriteData(fid,'object',obj,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
                 end % }}}
         end

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad