Changeset 24866

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

Location:

issm/trunk-jpl/src/m

Files:

• classes/flowequation.js (modified) (1 diff)
• classes/groundingline.js (modified) (1 diff)
• classes/mask.js (modified) (4 diffs)
• classes/maskpsl.js (modified) (4 diffs)
• classes/maskpsl.m (modified) (6 diffs)
• classes/maskpsl.py (modified) (6 diffs)
• classes/model.js (modified) (1 diff)
• classes/stressbalance.js (modified) (2 diffs)
• parameterization/setmask.js (modified) (1 diff)

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

@@ -92 +92 @@
                         if(ArrayAnyEqual(ArrayIsMember('StressbalanceSIAAnalysis', analyses),1)){
                                 if (ArrayAnyEqual(this.element_equation,1)){
-                                        if(this.vertex_equation & ArrayAnyBelowStrict(md.mask.groundedice_levelset)){
+                                        if(this.vertex_equation & ArrayAnyBelowStrict(md.mask.ocean_levelset)){
                                                 console.log(sprintf("\n !!! Warning: SIA's model is not consistent on ice shelves !!!\n"));
                                         }

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

@@ -34 +34 @@
                                 }
                                 for (var i=0;i<md.mesh.numberofvertices;i++){
-                                        if(md.mask.groundedice_levelset[i]>0){
+                                        if(md.mask.ocean_levelset[i]>0){
                                                 md.checkmessage('base not equal to bed on grounded ice!');
                                                 break;

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

@@ -7 +7 @@
         //properties 
         // {{{
-                this.groundedice_levelset                           = NaN;
+                this.ocean_levelset                           = NaN;
                 this.ice_levelset                           = NaN;
                 //}}}
@@ -16 +16 @@
                         console.log(sprintf("   mask:")); 
 
-                        fielddisplay(this,"groundedice_levelset","is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0");
+                        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");
                 } //}}}
                 this.extrude = function(md) {//{{{
-                        this.groundedice_levelset=project3d(md,'vector',this.groundedice_levelset,'type','node');
+                        this.ocean_levelset=project3d(md,'vector',this.ocean_levelset,'type','node');
                         this.ice_levelset=project3d(md,'vector',this.ice_levelset,'type','node');
                         return this;
@@ -29 +29 @@
                 this.checkconsistency = function(md,solution,analyses){ //{{{
 
-                        checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices, 1]);
+                        checkfield(md,'fieldname','mask.ocean_levelset','size',[md.mesh.numberofvertices, 1]);
                         checkfield(md,'fieldname','mask.ice_levelset'        ,'size',[md.mesh.numberofvertices, 1]);
                         var isice=NewArrayFill(md.mesh.numberofvertices,0); 
@@ -41 +41 @@
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
-            WriteData(fid,prefix,'object',this,'fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
+            WriteData(fid,prefix,'object',this,'fieldname','ocean_levelset','format','DoubleMat','mattype',1);
             WriteData(fid,prefix,'object',this,'fieldname','ice_levelset','format','DoubleMat','mattype',1);
                 }//}}}

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

@@ -7 +7 @@
         //properties 
         // {{{
-                this.groundedice_levelset                           = NaN;
+                this.ocean_levelset                           = NaN;
                 this.ice_levelset                           = NaN;
                 this.land_levelset                           = NaN;
@@ -18 +18 @@
                         console.log(sprintf("   mask:")); 
 
-                        fielddisplay(this,"groundedice_levelset","is ice grounded ? grounded ice if > 0, grounding line position if = 0, floating ice if < 0");
+                        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 +28 @@
                 this.checkconsistency = function(md,solution,analyses){ //{{{
 
-                        checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices, 1]);
+                        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 +59 @@
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
-                        WriteData(fid,prefix,'object',this,'class','mask','fieldname','groundedice_levelset','format','DoubleMat','mattype',1);
+                        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);

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

@@ -6 +6 @@
 classdef maskpsl 
         properties (SetAccess=public) 
-                ocean_levelset = NaN;
-                ice_levelset         = NaN;
-                ocean_levelset = NaN;
-                land_levelset = NaN;
+                ice_levelset     = NaN;
+                ocean_levelset   = NaN;
+                land_levelset    = NaN;
                 glacier_levelset = NaN;
         end
@@ -20 +19 @@
         methods
                 function self = 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');
@@ -40 +38 @@
                         if strcmpi(solution,'LoveSolution'), return; end;
 
-                        md = checkfield(md,'fieldname','mask.ocean_levelset','size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','mask.ice_levelset'        ,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','mask.ocean_levelset','size',[md.mesh.numberofvertices 1]);
@@ -47 +44 @@
                 function disp(self) % {{{
                         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,'ice_levelset','presence of ice if < 0, icefront position if = 0, no ice if > 0');
                         fielddisplay(self,'ocean_levelset','is the vertex on the ocean ? yes if = 1, no if = 0');
@@ -55 +51 @@
                 function marshall(self,prefix,md,fid) % {{{
                         WriteData(fid,prefix,'name','md.mask.type','data',class(md.mask),'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);
@@ -62 +57 @@
                 function savemodeljs(self,fid,modelname) % {{{
                         fprintf(fid,'%s.mask=new maskpsl();\n',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);

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)

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

@@ -643 +643 @@
                                 md.geometry.bed=project2d(md,md.geometry.bed,1);
 
-                        if (!Number.isNaN(md.mask.groundedice_levelset))
-                                md.mask.groundedice_levelset=project2d(md,md.mask.groundedice_levelset,1);
+                        if (!Number.isNaN(md.mask.ocean_levelset))
+                                md.mask.ocean_levelset=project2d(md,md.mask.ocean_levelset,1);
 
                         if (!Number.isNaN(md.mask.ice_levelset))

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

@@ -97 +97 @@
 
                 //singular solution
-                if(!ArrayAnyNaN(md.stressbalance.spcvx) | !ArrayAnyNaN(md.stressbalance.spcvy) |  !ArrayAnyAboveStrict(md.mask.groundedice_levelset,0)){
+                if(!ArrayAnyNaN(md.stressbalance.spcvx) | !ArrayAnyNaN(md.stressbalance.spcvy) |  !ArrayAnyAboveStrict(md.mask.ocean_levelset,0)){
                         md = checkmessage(md,'model is not well posed (singular). You need at least one node with fixed velocity!');
                         console.log(sprintf('\n !!! Warning: no spc applied, model might not be well posed if no basal friction is applied, check for solution crash\n'));
@@ -126 +126 @@
                 //CHECK THAT NO rotation specified for FS Grounded ice at base
                 if (md.mesh.domaintype() == '3D' & md.flowequation.isFS){
-                        for(var i=0;i<md.mask.groundedice_levelset.length;i++){
-                                if(md.mask.groundedice_levelset[i]>0 & md.mesh.vertexonbase[i]){
+                        for(var i=0;i<md.mask.ocean_levelset.length;i++){
+                                if(md.mask.ocean_levelset[i]>0 & md.mesh.vertexonbase[i]){
                                         if(!ArrayIsNan(md.stressbalance.referential[i])){
                                                 md.checkmessage('no referential should be specified for basal vertices of grounded ice');

issm/trunk-jpl/src/m/parameterization/setmask.js

@@ -63 +63 @@
 
         //level sets
-        groundedice_levelset=vertexongroundedice;
-        pos=ArrayFind(vertexongroundedice,0);for(var i=0;i<pos.length;i++) groundedice_levelset[i]=-1;
-        md.mask.groundedice_levelset=groundedice_levelset;
+        ocean_levelset=vertexongroundedice;
+        pos=ArrayFind(vertexongroundedice,0);for(var i=0;i<pos.length;i++) ocean_levelset[i]=-1;
+        md.mask.ocean_levelset=ocean_levelset;
 
         if(arguments.length>3){