Changeset 13032

Timestamp:

08/14/12 14:55:08 (13 years ago)

Author:

jschierm

Message:

CHG: Python any/all vs. numpy.any/numpy.all modifications (and more).

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/SetIceShelfBC.py (modified) (1 diff)
• classes/diagnostic.py (modified) (3 diffs)
• classes/flaim.py (modified) (1 diff)
• classes/flowequation.py (modified) (1 diff)
• classes/groundingline.py (modified) (1 diff)
• classes/initialization.py (modified) (2 diffs)
• classes/mesh.py (modified) (1 diff)
• parameterization/setflowequation.py (modified) (6 diffs)

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

@@ -69 +69 @@
 
         #Create zeros basalforcings and surfaceforcings
-        if all(numpy.isnan(md.surfaceforcings.precipitation)):
+        if numpy.all(numpy.isnan(md.surfaceforcings.precipitation)):
                 md.surfaceforcings.precipitation=numpy.zeros(md.mesh.numberofvertices)
                 print '      no surfaceforcings.precipitation specified: values set as zero'
-        if all(numpy.isnan(md.surfaceforcings.mass_balance)):
+        if numpy.all(numpy.isnan(md.surfaceforcings.mass_balance)):
                 md.surfaceforcings.mass_balance=numpy.zeros(md.mesh.numberofvertices)
                 print '      no surfaceforcings.mass_balance specified: values set as zero'
-        if all(numpy.isnan(md.basalforcings.melting_rate)):
+        if numpy.all(numpy.isnan(md.basalforcings.melting_rate)):
                 md.basalforcings.melting_rate=numpy.zeros(md.mesh.numberofvertices)
                 print '      no basalforcings.melting_rate specified: values set as zero'
-        if all(numpy.isnan(md.balancethickness.thickening_rate)):
+        if numpy.all(numpy.isnan(md.balancethickness.thickening_rate)):
                 md.balancethickness.thickening_rate=numpy.zeros(md.mesh.numberofvertices)
                 print '      no balancethickness.thickening_rate specified: values set as zero'

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

@@ -139 +139 @@
 
                 #singular solution
-                if not any(numpy.logical_and(numpy.logical_not(numpy.isnan(md.diagnostic.spcvx)),numpy.logical_not(numpy.isnan(md.diagnostic.spcvy)))):
+                if not numpy.any(numpy.logical_and(numpy.logical_not(numpy.isnan(md.diagnostic.spcvx)),numpy.logical_not(numpy.isnan(md.diagnostic.spcvy)))):
                         md.checkmessage("model is not well posed (singular). You need at least one node with fixed velocity!")
                 #CHECK THAT EACH LINES CONTAINS ONLY NAN VALUES OR NO NAN VALUES
@@ -148 +148 @@
                         pos=[i for i,item in enumerate(numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)) if item==0]
 #                       numpy.inner (and numpy.dot) calculate all the dot product permutations, resulting in a full matrix multiply
-#                       if any(numpy.abs(numpy.inner(md.diagnostic.referential[pos,0:2],md.diagnostic.referential[pos,3:5]).diagonal())>sys.float_info.epsilon):
+#                       if numpy.any(numpy.abs(numpy.inner(md.diagnostic.referential[pos,0:2],md.diagnostic.referential[pos,3:5]).diagonal())>sys.float_info.epsilon):
 #                               md.checkmessage("Vectors in diagnostic.referential (columns 1 to 3 and 4 to 6) must be orthogonal")
                         for item in md.diagnostic.referential[pos,:]:
@@ -156 +156 @@
                 if md.mesh.dimension==3 and md.flowequation.isstokes:
                         pos=numpy.nonzero(numpy.logical_and(md.mask.vertexongroundedice,md.mesh.vertexonbed))
-                        if any(not numpy.isnan(md.diagnostic.referential[pos,:])):
+                        if numpy.any(numpy.logical_not(numpy.isnan(md.diagnostic.referential[pos,:]))):
                                 md.checkmessage("no referential should be specified for basal vertices of grounded ice")
 

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

@@ -68 +68 @@
 
                 md = checkfield(md,'flaim.tracks','file',1)
-                if any(numpy.isnan(md.flaim.criterion)) or not md.flaim.criterion:
+                if numpy.any(numpy.isnan(md.flaim.criterion)) or not md.flaim.criterion:
                         md = checkfield(md,'flaim.targets','file',1)
                 else:

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

@@ -71 +71 @@
                 if DiagnosticHutterAnalysisEnum() in analyses:
                         if any(md.flowequation.element_equation==1):
-                                if any(numpy.logical_and(md.flowequation.element_equation,md.mask.elementonfloatingice)):
+                                if numpy.any(numpy.logical_and(md.flowequation.element_equation,md.mask.elementonfloatingice)):
                                         print "\n !!! Warning: Hutter's model is not consistent on ice shelves !!!\n"
 

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

@@ -50 +50 @@
 
                 if not strcmp(self.migration,'None'):
-                        if any(numpy.isnan(md.geometry.bathymetry)):
+                        if numpy.any(numpy.isnan(md.geometry.bathymetry)):
                                 md.checkmessage("requesting grounding line migration, but bathymetry is absent!")
                         pos=numpy.nonzero(md.mask.vertexongroundedice)

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

@@ -54 +54 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
                 if DiagnosticHorizAnalysisEnum() in analyses:
-                        if not any(numpy.isnan(md.initialization.vx) or numpy.isnan(md.initialization.vy)):
+                        if not numpy.any(numpy.logical_or(numpy.isnan(md.initialization.vx),numpy.isnan(md.initialization.vy))):
                                 md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices])
                                 md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
@@ -66 +66 @@
                         md = checkfield(md,'initialization.vy','NaN',1,'size',[md.mesh.numberofvertices])
                         #Triangle with zero velocity
-                        if any(numpy.logical_and(numpy.sum(numpy.abs(md.initialization.vx[md.mesh.elements.astype(int)-1]),axis=1)==0,\
-                                                 numpy.sum(numpy.abs(md.initialization.vy[md.mesh.elements.astype(int)-1]),axis=1)==0)):
+                        if numpy.any(numpy.logical_and(numpy.sum(numpy.abs(md.initialization.vx[md.mesh.elements.astype(int)-1]),axis=1)==0,\
+                                                       numpy.sum(numpy.abs(md.initialization.vy[md.mesh.elements.astype(int)-1]),axis=1)==0)):
                                 md.checkmessage("at least one triangle has all its vertices with a zero velocity")
                 if ThermalAnalysisEnum() in analyses:

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

@@ -137 +137 @@
                 else:
                         md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements,6])
-                if any(numpy.logical_not(ismember(range(1,md.mesh.numberofvertices+1),md.mesh.elements))):
+                if numpy.any(numpy.logical_not(ismember(range(1,md.mesh.numberofvertices+1),md.mesh.elements))):
                         md.checkmessage("orphan nodes have been found. Check the mesh outline")
                 md = checkfield(md,'mesh.dimension','values',[2,3])

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

@@ -69 +69 @@
         #Check that no pattyn or stokes for 2d mesh
         if md.mesh.dimension==2:
-                if any(numpy.logical_or(stokesflag,pattynflag)):
+                if numpy.any(numpy.logical_or(stokesflag,pattynflag)):
                         raise TypeError("setflowequation error message: stokes and pattyn elements not allowed in 2d mesh, extrude it first")
 
@@ -124 +124 @@
 
                 #initialize and fill in penalties structure
-                if all(numpy.logical_not(numpy.isnan(bordernodes2d))):
+                if numpy.all(numpy.logical_not(numpy.isnan(bordernodes2d))):
                         penalties=numpy.zeros((0,2))
                         for     i in xrange(1,numlayers):
@@ -146 +146 @@
                         pos=numpy.nonzero(macayealpattynflag)
                         elist=numpy.zeros(len(pos))
-                        elist = elist + any(numpy.sum(nodeonmacayeal[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
-                        elist = elist - any(numpy.sum(nodeonpattyn[md.mesh.elements[pos,:].astype(int)-1]  ,axis=1),axis=1)
+                        elist = elist + numpy.any(numpy.sum(nodeonmacayeal[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
+                        elist = elist - numpy.any(numpy.sum(nodeonpattyn[md.mesh.elements[pos,:].astype(int)-1]  ,axis=1),axis=1)
                         pos1=[i for i,item in enumerate(elist) if item==1]
                         macayealflag[pos[pos1]]=1
@@ -178 +178 @@
                         pos=numpy.nonzero(pattynstokesflag)
                         elist=numpy.zeros(len(pos))
-                        elist = elist + any(numpy.sum(nodeonstokes[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
-                        elist = elist - any(numpy.sum(nodeonpattyn[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
+                        elist = elist + numpy.any(numpy.sum(nodeonstokes[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
+                        elist = elist - numpy.any(numpy.sum(nodeonpattyn[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
                         pos1=[i for i,item in enumerate(elist) if item==1]
                         stokesflag[pos[pos1]]=1
@@ -210 +210 @@
                         pos=numpy.nonzero(macayealstokesflag)
                         elist=numpy.zeros(len(pos))
-                        elist = elist + any(numpy.sum(nodeonmacayeal[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
-                        elist = elist - any(numpy.sum(nodeonstokes[md.mesh.elements[pos,:].astype(int)-1]  ,axis=1),axis=1)
+                        elist = elist + numpy.any(numpy.sum(nodeonmacayeal[md.mesh.elements[pos,:].astype(int)-1],axis=1),axis=1)
+                        elist = elist - numpy.any(numpy.sum(nodeonstokes[md.mesh.elements[pos,:].astype(int)-1]  ,axis=1),axis=1)
                         pos1=[i for i,item in enumerate(elist) if item==1]
                         macayealflag[pos[pos1]]=1
@@ -271 +271 @@
         #figure out solution types
         md.flowequation.ishutter=float(any(md.flowequation.element_equation==1))
-        md.flowequation.ismacayealpattyn=float(any(numpy.logical_or(md.flowequation.element_equation==2,md.flowequation.element_equation==3)))
+        md.flowequation.ismacayealpattyn=float(numpy.any(numpy.logical_or(md.flowequation.element_equation==2,md.flowequation.element_equation==3)))
         md.flowequation.isstokes=float(any(md.flowequation.element_equation==4))