Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/groundingline.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/groundingline.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/groundingline.py (revision 13032) @@ -49,7 +49,7 @@ md = checkfield(md,'groundingline.migration','values',['None','AgressiveMigration','SoftMigration']) 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) if any(numpy.abs(md.geometry.bed[pos]-md.geometry.bathymetry[pos])>10**-10): Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/mesh.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/mesh.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/mesh.py (revision 13032) @@ -136,7 +136,7 @@ md = checkfield(md,'mesh.elements','size',[md.mesh.numberofelements,3]) 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]) md = checkfield(md,'mesh.numberoflayers','>=',0) Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/diagnostic.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/diagnostic.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/diagnostic.py (revision 13032) @@ -138,7 +138,7 @@ md = checkfield(md,'diagnostic.requested_outputs','size',[float('NaN'),1]) #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 if any(not numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)==0 and not numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)==6): @@ -147,7 +147,7 @@ if any(numpy.sum(numpy.isnan(md.diagnostic.referential),axis=1)==0): 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,:]: if numpy.abs(numpy.inner(item[0:2],item[3:5]))>sys.float_info.epsilon: @@ -155,7 +155,7 @@ #CHECK THAT NO rotation specified for FS Grounded ice at base 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") return md Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/initialization.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/initialization.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/initialization.py (revision 13032) @@ -53,7 +53,7 @@ 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]) if PrognosticAnalysisEnum() in analyses: @@ -65,8 +65,8 @@ md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) 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: md = checkfield(md,'initialization.vx','NaN',1,'size',[md.mesh.numberofvertices]) Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/flaim.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/flaim.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/flaim.py (revision 13032) @@ -67,7 +67,7 @@ return md 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: md = checkfield(md,'flaim.criterion','numel',[md.mesh.numberofvertices,md.mesh.numberofelements]) Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/flowequation.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/flowequation.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/classes/flowequation.py (revision 13032) @@ -70,7 +70,7 @@ 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" return md Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py (revision 13032) @@ -68,16 +68,16 @@ md.diagnostic.icefront=pressureload #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' Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.py =================================================================== --- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.py (revision 13031) +++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/src/m/parameterization/setflowequation.py (revision 13032) @@ -68,7 +68,7 @@ #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") #Stokes can only be used alone for now: @@ -123,7 +123,7 @@ bordernodes2d=numpy.nonzero(numpy.logical_and(nodeonpattyn[1:numnodes2d],nodeonmacayeal[1:numnodes2d])) #Nodes connected to two different types of elements #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): penalties=numpy.concatenate((penalties,numpy.concatenate((bordernodes2d,bordernodes2d+md.mesh.numberofvertices2d*(i)),axis=1)),axis=0) @@ -145,8 +145,8 @@ #rule out elements that don't touch the 2 boundaries 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 macayealpattynflag[pos[pos1]]=0 @@ -177,8 +177,8 @@ #rule out elements that don't touch the 2 boundaries 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 pattynstokesflag[pos[pos1]]=0 @@ -209,8 +209,8 @@ #rule out elements that don't touch the 2 boundaries 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 macayealstokesflag[pos[pos1]]=0 @@ -270,7 +270,7 @@ #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)) return md