Changeset 15942

Timestamp:

08/26/13 10:25:13 (12 years ago)

Author:

seroussi

Message:

CHG: added groundedice_levelset in matlab class

Location:

issm/trunk-jpl/src/m/classes

Files:

• mask.m (modified) (4 diffs)
• mask.py (modified) (3 diffs)

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

@@ -11 +11 @@
                 vertexongroundedice  = NaN;
                 vertexonrock         = NaN;
-                icelevelset          = NaN;
+                groundedice_levelset = NaN;
+                ice_levelset         = NaN;
         end
         methods
@@ -29 +30 @@
                         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.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.icelevelset'         ,'size',[md.mesh.numberofvertices 1]);
-                        isice=(md.mask.icelevelset>0);
+                        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.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.icelevelset > 0');
+                                error('elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0');
                         end
                         %md = checkfield(md,'mask.vertexonrock'      ,'size',[md.mesh.numberofvertices 1],'values',[0 1]);
@@ -46 +48 @@
                         fielddisplay(obj,'vertexongroundedice','vertex on grounded ice flags list');
                         fielddisplay(obj,'vertexonrock','vertex on rock flags list');
-                        fielddisplay(obj,'icelevelset','presence of ice if > 0, icefront position if = 0, no ice if < 0');
+                        fielddisplay(obj,'grounded_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) % {{{
@@ -53 +56 @@
                         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','icelevelset','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

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

@@ -17 +17 @@
                 self.vertexonfloatingice  = float('NaN')
                 self.vertexongroundedice  = float('NaN')
-                self.icelevelset          = float('NaN')
+                self.ice_levelset          = float('NaN')
+                self.groundedice_levelset          = float('NaN')
 
                 #set defaults
@@ -30 +31 @@
                 string="%s\n%s"%(string,fielddisplay(self,"elementongroundedice","element on grounded ice list"))
                 string="%s\n%s"%(string,fielddisplay(self,"vertexongroundedice","vertex on grounded ice flags list"))
-                string="%s\n%s"%(string,fielddisplay(self,"icelevelset","presence of ice if > 0, icefront position if = 0, no ice if < 0"))
+                string="%s\n%s"%(string,fielddisplay(self,"groundedice_levelset","is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0"))
+                string="%s\n%s"%(string,fielddisplay(self,"ice_levelset","presence of ice if > 0, icefront position if = 0, no ice if < 0"))
                 return string
                 #}}}
@@ -55 +57 @@
                 WriteData(fid,'object',self,'fieldname','vertexonfloatingice','format','DoubleMat','mattype',1)
                 WriteData(fid,'object',self,'fieldname','vertexongroundedice','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'fieldname','icelevelset','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1)
+                WriteData(fid,'object',self,'fieldname','ice_levelset','format','DoubleMat','mattype',1)
         # }}}