Changeset 28086

Timestamp:

01/31/24 11:57:57 (15 months ago)

Author:

dmangini

Message:

CHG: now returns ocean_levelset and not md

File:

• issm/trunk-jpl/src/m/parameterization/sethydrostaticmask.m (modified) (3 diffs)

issm/trunk-jpl/src/m/parameterization/sethydrostaticmask.m

@@ -1 @@
-function md=sethydrostaticmask(md)
+function ocean_levelset = sethydrostaticmask(md)
 %SETHYDROSTATICMASK - establish ocean_levelset field
 %
@@ -6 +6 @@
 %
 %   Usage:
-%      md=sethydrostaticmask(md)
+%      ocean_levelset = sethydrostaticmask(md)
 %
 %   Examples:
-%      md=sethydrostaticmask(md);
+%      md.mask.ocean_levelset = sethydrostaticmask(md);
+
+%temporary warning for people that already use this function
+disp('Setting hydrostatic mask: WARNING - now returning ocean_levelset (not md)');
+disp('   -- you can blame Mathieu');
 
 if(length(md.geometry.bed)~=md.mesh.numberofvertices | length(md.geometry.thickness)~=md.mesh.numberofvertices | length(md.geometry.base)~=md.mesh.numberofvertices),
@@ -15 +19 @@
 end
 
-%grounded ice level set
-md.mask.ocean_levelset=md.geometry.thickness+md.geometry.bed*md.materials.rho_water/md.materials.rho_ice;
+%ocean level set based on height above floatation
+ocean_levelset=md.geometry.thickness+md.geometry.bed*md.materials.rho_water/md.materials.rho_ice;
 
 %Check consistency of geometry
-pos=find(md.mask.ocean_levelset>0);
+pos=find(ocean_levelset>0);
 if(any(md.geometry.base(pos)~=md.geometry.bed(pos))),
         disp('WARNING: md.geometry.bed and md.geometry.base not equal on grounded ice');
 end
 
-pos=find(md.mask.ocean_levelset<=0);
+pos=find(ocean_levelset<=0);
 if(any(md.geometry.base(pos)<md.geometry.bed(pos))),
         disp('WARNING: md.geometry.base < md.geometry.bed on floating ice');