Changeset 24867

Timestamp:

05/15/20 20:34:06 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renaming groundedice_levelset -> ocean_levelset (negative if ocean present, positive outside

Location:

issm/trunk-jpl/src/m/classes

Files:

• mask.js (modified) (1 diff)
• mask.m (modified) (1 diff)
• mask.py (modified) (3 diffs)
• maskpsl.js (modified) (4 diffs)

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

@@ -16 +16 @@
                         console.log(sprintf("   mask:")); 
 
-                        fielddisplay(this,"ocean_levelset","is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0");
+                        fielddisplay(this,"ocean_levelset","presence of ocean if < 0, coastline/grounding line if = 0, no ocean if > 0");
                         fielddisplay(this,"ice_levelset","presence of ice if < 0, icefront position if = 0, no ice if > 0");
                 } //}}}

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

@@ -50 +50 @@
                         disp(sprintf('   masks:'));
 
-                        fielddisplay(self,'ocean_levelset','is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0');
+                        fielddisplay(self,'ocean_levelset','presence of ocean if < 0, coastline/grounding line if = 0, no ocean if > 0');
                         fielddisplay(self,'ice_levelset','presence of ice if < 0, icefront position if = 0, no ice if > 0');
                 end % }}}

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

@@ -22 +22 @@
 
     #}}}
-
     def __repr__(self):  # {{{
         string = "   masks:"
 
-        string = "%s\n%s" % (string, fielddisplay(self, "ocean_levelset", "is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0"))
+        string = "%s\n%s" % (string, fielddisplay(self, "ocean_levelset", "presence of ocean if < 0, coastline/grounding line if = 0, no ocean 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
     #}}}
-
     def extrude(self, md):  # {{{
         self.ice_levelset = project3d(md, 'vector', self.ice_levelset, 'type', 'node')
@@ -36 +34 @@
         return self
     #}}}
-
     def setdefaultparameters(self):  # {{{
         return self
     #}}}
-
     def checkconsistency(self, md, solution, analyses):  # {{{
         if(solution == 'LoveSolution'):
@@ -52 +48 @@
         return md
     # }}}
-
     def marshall(self, prefix, md, fid):  # {{{
         WriteData(fid, prefix, 'object', self, 'fieldname', 'ocean_levelset', 'format', 'DoubleMat', 'mattype', 1)

issm/trunk-jpl/src/m/classes/maskpsl.js

@@ -7 +7 @@
         //properties 
         // {{{
-                this.ocean_levelset                           = NaN;
-                this.ice_levelset                           = NaN;
-                this.land_levelset                           = NaN;
-                this.ocean_levelset                           = NaN;
+                this.ice_levelset   = NaN;
+                this.land_levelset  = NaN;
+                this.ocean_levelset = NaN;
                 //}}}
         //methods 
@@ -18 +17 @@
                         console.log(sprintf("   mask:")); 
 
-                        fielddisplay(this,"ocean_levelset","is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0");
                         fielddisplay(this,"ice_levelset","presence of ice if < 0, icefront position if = 0, no ice if > 0");
                         fielddisplay(this,"ocean_levelset","is the vertex on the ocean? yes if = 1, no if = 0");
@@ -28 +26 @@
                 this.checkconsistency = function(md,solution,analyses){ //{{{
 
-                        checkfield(md,'fieldname','mask.ocean_levelset','size',[md.mesh.numberofvertices, 1]);
                         checkfield(md,'fieldname','mask.ice_levelset'        ,'size',[md.mesh.numberofvertices, 1]);
                         checkfield(md,'fieldname','mask.ocean_levelset'        ,'size',[md.mesh.numberofvertices, 1]);
@@ -59 +56 @@
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
-                        WriteData(fid,prefix,'object',this,'class','mask','fieldname','ocean_levelset','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',this,'class','mask','fieldname','ice_levelset','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',this,'class','mask','fieldname','ocean_levelset','format','DoubleMat','mattype',1);