Changeset 20260

Timestamp:

02/27/16 19:10:33 (9 years ago)

Author:

Eric.Larour

Message:

CHG: check only on places that are on the ice! Not on the ocean.

File:

• issm/trunk-jpl/src/m/classes/groundingline.m (modified) (1 diff)

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

@@ -31 +31 @@
                                         md = checkmessage(md,['requesting grounding line migration, but bathymetry is absent!']);
                                 end
-                                pos=find(md.mask.groundedice_levelset>0.);
+                                pos=find(md.mask.groundedice_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
-                                if any(md.geometry.bed - md.geometry.base > 10^-9),
+                                pos=find(md.mask.groundedice_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!']);
                                 end