Changeset 14211 for issm/trunk-jpl/src/m/classes/model/model.py

Timestamp:

01/07/13 10:11:26 (12 years ago)

Author:

jschierm

Message:

NEW: Implement new python logical functions to get rid of ugly nesting.

File:

• issm/trunk-jpl/src/m/classes/model/model.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/model/model.py

@@ -45 +45 @@
 from ElementConnectivity import *
 from contourenvelope import *
+from PythonFuncs import *
 #}}}
 
@@ -407 +408 @@
                                 md2.diagnostic.icefront[:,2]=Pnode[md1.diagnostic.icefront[:,2].astype(int)-1]
                                 md2.diagnostic.icefront[:,3]=Pnode[md1.diagnostic.icefront[:,3].astype(int)-1]
-                        md2.diagnostic.icefront=md2.diagnostic.icefront[numpy.nonzero(numpy.logical_and(numpy.logical_and(md2.diagnostic.icefront[:,0],md2.diagnostic.icefront[:,1]),md2.diagnostic.icefront[:,-1]))[0],:]
+                        md2.diagnostic.icefront=md2.diagnostic.icefront[numpy.nonzero(logical_and_n(md2.diagnostic.icefront[:,0],md2.diagnostic.icefront[:,1],md2.diagnostic.icefront[:,-1]))[0],:]
 
                 #Results fields