Changeset 17036

Timestamp:

12/20/13 16:17:05 (11 years ago)

Author:

Eric.Larour

Message:

CHG: better construct from Chris

File:

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

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(md.mask.groundedice_levelset<0. & md.mask.ice_levelset>=0)[0]
+                        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):
                                 md.checkmessage("bathymetry superior to bed on floating ice!")