Changeset 14211

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.

Location:

issm/trunk-jpl/src/m

Files:

• classes/model/model.py (modified) (2 diffs)
• geometry/FlagElements.py (modified) (2 diffs)
• mesh/ElementsFromEdge.py (modified) (2 diffs)
• miscellaneous/PythonFuncs.py (added)
• parameterization/setflowequation.py (modified) (3 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

issm/trunk-jpl/src/m/geometry/FlagElements.py

@@ -4 +4 @@
 from ContourToMesh import *
 from MatlabFuncs import *
+from PythonFuncs import *
 
 def FlagElements(md,region):
@@ -43 +44 @@
                                 raise RuntimeError("FlagElements.py calling basinzoom.py is not complete.")
                                 xlim,ylim=basinzoom('basin',region)
-                                flag_nodes=numpy.logical_and(numpy.logical_and(md.mesh.x<xlim[1],md.mesh.x>xlim[0]),numpy.logical_and(md.mesh.y<ylim[1],md.mesh.y>ylim[0]))
+                                flag_nodes=logical_and_n(md.mesh.x<xlim[1],md.mesh.x>xlim[0],md.mesh.y<ylim[1],md.mesh.y>ylim[0])
                                 flag=numpy.prod(flag_nodes[md.mesh.elements],axis=1).astype(bool)
                         else:

issm/trunk-jpl/src/m/mesh/ElementsFromEdge.py

@@ -1 +1 @@
 import numpy
+from PythonFuncs import *
 
 def ElementsFromEdge(elements,A,B):
@@ -12 +13 @@
 
         edgeelements=numpy.nonzero(\
-                numpy.logical_or( \
-                numpy.logical_or( \
-                numpy.logical_or(numpy.logical_and(elements[:,0]==A,elements[:,1]==B), \
-                                                 numpy.logical_and(elements[:,0]==A,elements[:,2]==B)) \
-                , \
-                numpy.logical_or(numpy.logical_and(elements[:,1]==A,elements[:,2]==B), \
-                                                 numpy.logical_and(elements[:,1]==A,elements[:,0]==B)) \
-                ), \
-                numpy.logical_or(numpy.logical_and(elements[:,2]==A,elements[:,0]==B), \
-                                                 numpy.logical_and(elements[:,2]==A,elements[:,1]==B)) \
+                logical_or_n(numpy.logical_and(elements[:,0]==A,elements[:,1]==B), \
+                                         numpy.logical_and(elements[:,0]==A,elements[:,2]==B), \
+                                         numpy.logical_and(elements[:,1]==A,elements[:,2]==B), \
+                                         numpy.logical_and(elements[:,1]==A,elements[:,0]==B), \
+                                         numpy.logical_and(elements[:,2]==A,elements[:,0]==B), \
+                                         numpy.logical_and(elements[:,2]==A,elements[:,1]==B), \
                 ))[0]+1
 

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -3 +3 @@
 from pairoptions import *
 from MatlabFuncs import *
+from PythonFuncs import *
 from FlagElements import *
 
@@ -50 +51 @@
         #Flag the elements that have not been flagged as filltype
         if   strcmpi(filltype,'hutter'):
-                hutterflag[numpy.nonzero(numpy.logical_not(numpy.logical_or(macayealflag,pattynflag)))]=True
+                hutterflag[numpy.nonzero(numpy.logical_not(logical_or_n(macayealflag,pattynflag)))]=True
         elif strcmpi(filltype,'macayeal'):
-                macayealflag[numpy.nonzero(numpy.logical_not(numpy.logical_or(hutterflag,numpy.logical_or(pattynflag,stokesflag))))]=True
+                macayealflag[numpy.nonzero(numpy.logical_not(logical_or_n(hutterflag,pattynflag,stokesflag)))]=True
         elif strcmpi(filltype,'pattyn'):
-                pattynflag[numpy.nonzero(numpy.logical_not(numpy.logical_or(hutterflag,numpy.logical_or(macayealflag,stokesflag))))]=True
+                pattynflag[numpy.nonzero(numpy.logical_not(logical_or_n(hutterflag,macayealflag,stokesflag)))]=True
 
         #check that each element has at least one flag
@@ -69 +70 @@
         #Check that no pattyn or stokes for 2d mesh
         if md.mesh.dimension==2:
-                if numpy.any(numpy.logical_or(l1l2flag,stokesflag,pattynflag)):
+                if numpy.any(logical_or_n(l1l2flag,stokesflag,pattynflag)):
                         raise TypeError("stokes and pattyn elements not allowed in 2d mesh, extrude it first")