Changeset 21085

Timestamp:

08/04/16 13:43:56 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing python test

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive2002.nc (modified) ( previous)
• NightlyRun/test2002.m (modified) (2 diffs)
• NightlyRun/test2002.py (modified) (3 diffs)

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

@@ -31 +31 @@
 icemask=ones(md.mesh.numberofvertices,1);
 pos=find(mask==0);  icemask(pos)=-1;
-pos=find(sum(mask(md.mesh.elements),2)<3);   icemask(md.mesh.elements(pos))=-1;
-
+pos=find(sum(mask(md.mesh.elements),2)<3);   icemask(md.mesh.elements(pos,:))=-1;
 md.mask.ice_levelset=icemask;
 md.mask.ocean_levelset=zeros(md.mesh.numberofvertices,1);
@@ -43 +42 @@
 %make sure wherever there is an ice load, that the mask is set to ice: 
 pos=find(md.slr.deltathickness); md.mask.ice_levelset(md.mesh.elements(pos,:))=-1;
-
 % }}}
 

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

@@ -1 +1 @@
 #Test Name: EarthSlr
-#Earth Sea Level Rise test. Uses the mesh3dsurface geometry.
 from MatlabFuncs import *
 from PythonFuncs import *
@@ -42 +41 @@
 
 icemask=ones((md.mesh.numberofvertices,1))
-pos=nonzero(mask==0);  icemask[pos]=-1
-pos=nonzero(sum(mask[md.mesh.elements.astype(int)-1],axis=1)<3)
-icemask[md.mesh.elements[pos].astype(int)-1]=-1
+pos=nonzero(mask==0)[0];  icemask[pos]=-1
+pos=nonzero(sum(mask[md.mesh.elements.astype(int)-1],axis=1)<3)[0]
+icemask[md.mesh.elements[pos,:].astype(int)-1]=-1
 md.mask.ice_levelset=icemask
 
@@ -54 +53 @@
 md.mask.land_levelset=zeros((md.mesh.numberofvertices,1))
 md.mask.groundedice_levelset=-ones((md.mesh.numberofvertices,1))
+
+#make sure wherever there is an ice load, that the mask is set to ice: 
+pos=nonzero(md.slr.deltathickness)[0];
+icemask[md.mesh.elements[pos,:]-1]=-1
 # }}}