Changeset 14212 for issm/trunk-jpl/test/NightlyRun/test1108.py

Timestamp:

01/07/13 10:30:35 (12 years ago)

Author:

jschierm

Message:

CHG: Get rid of more ugly Python logical nesting.

File:

• issm/trunk-jpl/test/NightlyRun/test1108.py (modified) (4 diffs)

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

@@ -8 +8 @@
 from solve import *
 from MatlabFuncs import *
+from PythonFuncs import *
 
 """
@@ -33 +34 @@
         md.diagnostic.spcvz=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
         
-        pos=numpy.nonzero(numpy.logical_and(md.mesh.vertexonbed,numpy.logical_and(numpy.logical_or(md.mesh.x==0.,md.mesh.x==numpy.max(md.mesh.x)),numpy.logical_or(md.mesh.y==0.,md.mesh.y==numpy.max(md.mesh.y)))))
+        pos=numpy.nonzero(logical_and_n(md.mesh.vertexonbed,numpy.logical_or(md.mesh.x==0.,md.mesh.x==numpy.max(md.mesh.x)),numpy.logical_or(md.mesh.y==0.,md.mesh.y==numpy.max(md.mesh.y))))
         md.diagnostic.spcvx[pos]=0.
         md.diagnostic.spcvy[pos]=0.
@@ -42 +43 @@
         posx2=numpy.nonzero(md.mesh.x==numpy.max(md.mesh.x))[0]
 
-        posy=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.y==0.,md.mesh.x!=0.),md.mesh.x!=numpy.max(md.mesh.x)))[0]    #Don't take the same nodes two times
-        posy2=numpy.nonzero(numpy.logical_and(numpy.logical_and(md.mesh.y==numpy.max(md.mesh.y),md.mesh.x!=0.),md.mesh.x!=numpy.max(md.mesh.x)))[0]
+        posy=numpy.nonzero(logical_and_n(md.mesh.y==0.,md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x)))[0]    #Don't take the same nodes two times
+        posy2=numpy.nonzero(logical_and_n(md.mesh.y==numpy.max(md.mesh.y),md.mesh.x!=0.,md.mesh.x!=numpy.max(md.mesh.x)))[0]
 
         md.diagnostic.vertex_pairing=numpy.vstack((numpy.hstack((posx.reshape(-1,1)+1,posx2.reshape(-1,1)+1)),numpy.hstack((posy.reshape(-1,1)+1,posy2.reshape(-1,1)+1))))
@@ -58 +59 @@
         md.diagnostic.spcvy=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
         md.diagnostic.spcvz=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
-        pos=numpy.nonzero(numpy.logical_or(numpy.logical_or(md.mesh.y==0.,md.mesh.x==0.),numpy.logical_or(md.mesh.x==numpy.max(md.mesh.x),md.mesh.y==numpy.max(md.mesh.y))))    #Don't take the same nodes two times
+        pos=numpy.nonzero(logical_or_n(md.mesh.y==0.,md.mesh.x==0.,md.mesh.x==numpy.max(md.mesh.x),md.mesh.y==numpy.max(md.mesh.y)))    #Don't take the same nodes two times
         md.diagnostic.spcvx[pos]=md.results.DiagnosticSolution.Vx[pos]
         md.diagnostic.spcvy[pos]=md.results.DiagnosticSolution.Vy[pos]