Changeset 24866 for issm/trunk-jpl/src/m/classes/maskpsl.py

Timestamp:

05/15/20 20:30:32 (5 years ago)

Author:

Mathieu Morlighem

Message:

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

File:

• issm/trunk-jpl/src/m/classes/maskpsl.py (modified) (6 diffs)

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

@@ -14 +14 @@
 
     def __init__(self, *args):  # {{{
-        self.ocean_levelset = float('NaN')
         self.ice_levelset = float('NaN')
         self.ocean_levelset = float('NaN')
@@ -27 +26 @@
     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, 'ice_levelset', 'presence of ice if < 0, icefront position if = 0, no ice if > 0'))
         string = "%s\n%s" % (string, fielddisplay(self, 'ocean_levelset', 'is the vertex on the ocean ? yes if = 1, no if = 0'))
@@ -50 +48 @@
 
     def checkconsistency(self, md, solution, analyses):  # {{{
-        md = checkfield(md, 'fieldname', 'mask.ocean_levelset', 'size', [md.mesh.numberofvertices])
         md = checkfield(md, 'fieldname', 'mask.ice_levelset', 'size', [md.mesh.numberofvertices])
         md = checkfield(md, 'fieldname', 'mask.ocean_levelset', 'size', [md.mesh.numberofvertices])
@@ -72 +69 @@
 
     def extrude(self, md):  # {{{
-        self.ocean_levelset = project3d(md, 'vector', self.ocean_levelset, 'type', 'node')
         self.ice_levelset = project3d(md, 'vector', self.ice_levelset, 'type', 'node')
         self.ocean_levelset = project3d(md, 'vector', self.ocean_levelset, 'type', 'node')
@@ -90 +86 @@
     def marshall(self, prefix, md, fid):  # {{{
         WriteData(fid, prefix, 'name', 'md.mask.type', 'data', type(md.mask).__name__, 'format', 'String')
-        WriteData(fid, prefix, 'object', self, 'class', 'mask', 'fieldname', 'ocean_levelset', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'class', 'mask', 'fieldname', 'ice_levelset', 'format', 'DoubleMat', 'mattype', 1)
         WriteData(fid, prefix, 'object', self, 'class', 'mask', 'fieldname', 'ocean_levelset', 'format', 'DoubleMat', 'mattype', 1)
@@ -97 +92 @@
 
     def savemodeljs(self, fid, modelname):  # {{{
-        writejs1Darray(fid, [modelname, '.mask.ocean_levelset'], self.ocean_levelset)
         writejs1Darray(fid, [modelname, '.mask.ice_levelset'], self.ice_levelset)
         writejs1Darray(fid, [modelname, '.mask.ocean_levelset'], self.ocean_levelset)