Changeset 25182

Timestamp:

06/29/20 15:25:08 (5 years ago)

Author:

jdquinn

Message:

BUG: Corrected test2003.py

File:

• issm/trunk-jpl/test/NightlyRun/test2003.py (modified) (3 diffs)

issm/trunk-jpl/test/NightlyRun/test2003.py

@@ -27 +27 @@
 #Access every element in lat using the indices in elements
 # - 1 to convert to base 0 indexing, 1 (not 2, in matlab) to sum over rows
-late = sum(md.mesh.lat[md.mesh.elements - 1], 1) / 3
-longe = sum(md.mesh.long[md.mesh.elements - 1], 1) / 3
-pos = np.intersect1d(np.array(np.where(late < -75)), np.array(np.where(longe < 0)))
+late = md.mesh.lat[md.mesh.elements - 1].sum(axis=1)/ 3
+longe = md.mesh.long[md.mesh.elements - 1].sum(axis=1)/ 3
+pos = np.intersect1d(np.array(np.where(late < -75)[0]), np.array(np.where(longe < 0)[0]))
 md.solidearth.surfaceload.icethicknesschange[pos] = -1
 
@@ -41 +41 @@
 pos = np.where(mask == 0)[0]
 icemask[pos] = -1
-pos = np.where(np.sum(mask[md.mesh.elements - 1], axis=1) < 3)
+pos = np.where(mask[md.mesh.elements - 1].sum(axis=1) < 3)[0]
 icemask[md.mesh.elements[pos, :] - 1] = -1
 md.mask.ice_levelset = icemask
@@ -52 +52 @@
 #make sure wherever there is an ice load, that the mask is set to ice:
 #pos = np.nonzero(md.solidearth.surfaceload.icethicknesschange)[0] # Do we need to do this twice?
-md.mask.ice_levelset[md.mesh.elements[pos, :] - 1] = 1
+md.mask.ice_levelset[md.mesh.elements[pos, :] - 1] = -1
 # }}}