Index: /issm/trunk-jpl/src/m/classes/flowequation.js =================================================================== --- /issm/trunk-jpl/src/m/classes/flowequation.js (revision 24865) +++ /issm/trunk-jpl/src/m/classes/flowequation.js (revision 24866) @@ -92,5 +92,5 @@ 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")); } Index: /issm/trunk-jpl/src/m/classes/groundingline.js =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.js (revision 24865) +++ /issm/trunk-jpl/src/m/classes/groundingline.js (revision 24866) @@ -34,5 +34,5 @@ } for (var i=0;i0){ + if(md.mask.ocean_levelset[i]>0){ md.checkmessage('base not equal to bed on grounded ice!'); break; Index: /issm/trunk-jpl/src/m/classes/mask.js =================================================================== --- /issm/trunk-jpl/src/m/classes/mask.js (revision 24865) +++ /issm/trunk-jpl/src/m/classes/mask.js (revision 24866) @@ -7,5 +7,5 @@ //properties // {{{ - this.groundedice_levelset = NaN; + this.ocean_levelset = NaN; this.ice_levelset = NaN; //}}} @@ -16,9 +16,9 @@ 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,5 +29,5 @@ 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,5 +41,5 @@ } // }}} 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); }//}}} Index: /issm/trunk-jpl/src/m/classes/maskpsl.js =================================================================== --- /issm/trunk-jpl/src/m/classes/maskpsl.js (revision 24865) +++ /issm/trunk-jpl/src/m/classes/maskpsl.js (revision 24866) @@ -7,5 +7,5 @@ //properties // {{{ - this.groundedice_levelset = NaN; + this.ocean_levelset = NaN; this.ice_levelset = NaN; this.land_levelset = NaN; @@ -18,5 +18,5 @@ 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,5 +28,5 @@ 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,5 +59,5 @@ } // }}} 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); Index: /issm/trunk-jpl/src/m/classes/maskpsl.m =================================================================== --- /issm/trunk-jpl/src/m/classes/maskpsl.m (revision 24865) +++ /issm/trunk-jpl/src/m/classes/maskpsl.m (revision 24866) @@ -6,8 +6,7 @@ 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,5 +19,4 @@ 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,5 +38,4 @@ 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,5 +44,4 @@ 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,5 +51,4 @@ 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,5 +57,4 @@ 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); Index: /issm/trunk-jpl/src/m/classes/maskpsl.py =================================================================== --- /issm/trunk-jpl/src/m/classes/maskpsl.py (revision 24865) +++ /issm/trunk-jpl/src/m/classes/maskpsl.py (revision 24866) @@ -14,5 +14,4 @@ def __init__(self, *args): # {{{ - self.ocean_levelset = float('NaN') self.ice_levelset = float('NaN') self.ocean_levelset = float('NaN') @@ -27,5 +26,4 @@ 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,5 +48,4 @@ 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,5 +69,4 @@ 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,5 +86,4 @@ 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,5 +92,4 @@ 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) Index: /issm/trunk-jpl/src/m/classes/model.js =================================================================== --- /issm/trunk-jpl/src/m/classes/model.js (revision 24865) +++ /issm/trunk-jpl/src/m/classes/model.js (revision 24866) @@ -643,6 +643,6 @@ 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)) Index: /issm/trunk-jpl/src/m/classes/stressbalance.js =================================================================== --- /issm/trunk-jpl/src/m/classes/stressbalance.js (revision 24865) +++ /issm/trunk-jpl/src/m/classes/stressbalance.js (revision 24866) @@ -97,5 +97,5 @@ //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,6 +126,6 @@ //CHECK THAT NO rotation specified for FS Grounded ice at base if (md.mesh.domaintype() == '3D' & md.flowequation.isFS){ - for(var i=0;i0 & md.mesh.vertexonbase[i]){ + for(var i=0;i0 & md.mesh.vertexonbase[i]){ if(!ArrayIsNan(md.stressbalance.referential[i])){ md.checkmessage('no referential should be specified for basal vertices of grounded ice'); Index: /issm/trunk-jpl/src/m/parameterization/setmask.js =================================================================== --- /issm/trunk-jpl/src/m/parameterization/setmask.js (revision 24865) +++ /issm/trunk-jpl/src/m/parameterization/setmask.js (revision 24866) @@ -63,7 +63,7 @@ //level sets - groundedice_levelset=vertexongroundedice; - pos=ArrayFind(vertexongroundedice,0);for(var i=0;i3){