Changeset 17037

Timestamp:

12/21/13 09:52:27 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing grounding line check (nothing was checked anymore...)

Location:

issm/trunk-jpl/src/m/classes

Files:

• groundingline.m (modified) (1 diff)
• groundingline.py (modified) (1 diff)

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

@@ -39 +39 @@
                                         md = checkmessage(md,['bathymetry not equal to bed on grounded ice!']);
                                 end
-                                pos=find(md.mask.groundedice_levelset<0. & md.mask.ice_levelset>=0);
-                                if any(md.geometry.bathymetry(pos)-md.geometry.bed(pos)>10^-9),
+                                if any(md.geometry.bathymetry - md.geometry.bed > 10^-9),
                                         md = checkmessage(md,['bathymetry superior to bed on floating ice!']);
                                 end

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

@@ -50 +50 @@
                         if any(numpy.abs(md.geometry.bed[pos]-md.geometry.bathymetry[pos])>10**-10):
                                 md.checkmessage("bathymetry not equal to bed on grounded ice!")
-                        pos=numpy.nonzero(numpy.logical_and(md.mask.groundedice_levelset<0,md.mask.ice_levelset>=0))[0]
-                        if any(md.geometry.bathymetry[pos]-md.geometry.bed[pos]>10**-9):
+                        if any(md.geometry.bathymetry - md.geometry.bed > 10**-9):
                                 md.checkmessage("bathymetry superior to bed on floating ice!")