[16134] | 1 | Index: ../trunk-jpl/src/m/classes/mask.py
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/m/classes/mask.py (revision 15599)
|
---|
| 4 | +++ ../trunk-jpl/src/m/classes/mask.py (revision 15600)
|
---|
| 5 | @@ -48,12 +48,12 @@
|
---|
| 6 | md = checkfield(md,'mask.vertexongroundedice' ,'size',[md.mesh.numberofvertices],'values',[0,1])
|
---|
| 7 | md = checkfield(md,'mask.vertexonwater' ,'size',[md.mesh.numberofvertices],'values',[0,1])
|
---|
| 8 | md = checkfield(md,'mask.icelevelset' ,'size',[md.mesh.numberofvertices])
|
---|
| 9 | - isice=numpy.zeros_like(md.mesh.numberofvertices,int)
|
---|
| 10 | - pos=npy.nonzero(md.mask.icelevelset>0)
|
---|
| 11 | - isice[pos]=1
|
---|
| 12 | - totalyicefree=(numpy.sum(isice[md.mesh.elements-1],axis=1)==0).astype(int)
|
---|
| 13 | - if any(totalyicefree)
|
---|
| 14 | - raise TypeError("elements with no ice not implemented yet, each element should have at least one vertex with md.mask.icelevelset > 0")
|
---|
| 15 | + isice=numpy.zeros(md.mesh.numberofvertices,int)
|
---|
| 16 | + pos=npy.nonzero(md.mask.icelevelset>0)
|
---|
| 17 | + isice[pos]=1
|
---|
| 18 | + totallyicefree=(numpy.sum(isice[md.mesh.elements-1],axis=1)==0).astype(int)
|
---|
| 19 | + if any(totallyicefree):
|
---|
| 20 | + raise TypeError("elements with no ice not implemented yet, each element should have at least one vertex with md.mask.icelevelset > 0")
|
---|
| 21 |
|
---|
| 22 | return md
|
---|
| 23 | # }}}
|
---|