Changeset 25836 for issm/trunk/src/m/classes/groundingline.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/groundingline.m (modified) (1 diff)

issm/trunk/src/m/classes/groundingline.m

@@ -37 +37 @@
                                         md = checkmessage(md,['requesting grounding line migration, but bathymetry is absent!']);
                                 end
-                                pos=find(md.mask.groundedice_levelset>0. & md.mask.ice_levelset<=0);
+                                pos=find(md.mask.ocean_levelset>0. & md.mask.ice_levelset<=0);
                                 if any(abs(md.geometry.base(pos)-md.geometry.bed(pos))>10^-10),
                                         md = checkmessage(md,['base not equal to bed on grounded ice!']);
                                 end
-                                pos=find(md.mask.groundedice_levelset<=0. & md.mask.ice_levelset<=0);
+                                pos=find(md.mask.ocean_levelset<=0. & md.mask.ice_levelset<=0);
                                 if any(md.geometry.bed(pos) - md.geometry.base(pos) > 10^-9),
                                         md = checkmessage(md,['bed superior to base on floating ice!']);