Changeset 25181

Timestamp:

06/29/20 14:50:53 (5 years ago)

Author:

jdquinn

Message:

BUG: Corrected test2002.py

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test2002.m (modified) (1 diff)
• test2002.py (modified) (3 diffs)
• test2010.py (modified) (1 diff)

issm/trunk-jpl/test/NightlyRun/test2002.m

@@ -3 +3 @@
 %mesh earth:
 md=model;
-md.mesh=gmshplanet('radius',6.371012*10^3,'resolution',700.); %500 km resolution mesh
+md.mesh=gmshplanet('radius',6.371012*10^3,'resolution',700.); %700 km resolution mesh
 
 %parameterize solidearth solution:

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

@@ -25 +25 @@
 
 #antarctica
-late = np.sum(md.mesh.lat[md.mesh.elements - 1], axis=1) / 3
-longe = np.sum(md.mesh.long[md.mesh.elements - 1], axis=1) / 3
+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.where(late < -80)[0]
 md.solidearth.surfaceload.icethicknesschange[pos] = -100
@@ -42 +42 @@
 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
 md.mask.ocean_levelset = -icemask
-
-#make sure that the ice level set is all inclusive:
-md.mask.land_levelset = np.zeros((md.mesh.numberofvertices, 1))
-md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, 1))
 
 #make sure that the elements that have loads are fully grounded
@@ -57 +53 @@
 #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
 # }}}
 

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

@@ -41 +41 @@
 mask = gmtmask(md.mesh.lat, md.mesh.long)
 icemask = np.ones((md.mesh.numberofvertices, 1))
-pos = np.where(mask == 0)
-icemask[pos[0]] = -1
+pos = np.where(mask == 0)[0]
+icemask[pos] = -1
 pos = np.where(mask[md.mesh.elements - 1].sum(axis=1) < 3)[0]
 icemask[md.mesh.elements[pos, :] - 1] = -1