Changeset 13032 for issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

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).

File:

• issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py (modified) (1 diff)

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'