Changeset 13244

Timestamp:

09/04/12 15:07:21 (13 years ago)

Author:

jschierm

Message:

BUG: Boolean must be converted to integer before adding in Python.

File:

• issm/trunk-jpl/src/m/parameterization/setflowequation.py (modified) (1 diff)

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

@@ -91 +91 @@
         if any(stokesflag):
 #               fullspcnodes=double((~isnan(md.diagnostic.spcvx)+~isnan(md.diagnostic.spcvy)+~isnan(md.diagnostic.spcvz))==3 | (nodeonpattyn & nodeonstokes));         %find all the nodes on the boundary of the domain without icefront
-                fullspcnodes=numpy.logical_or(numpy.logical_not(numpy.isnan(md.diagnostic.spcvx))+ \
-                                              numpy.logical_not(numpy.isnan(md.diagnostic.spcvy))+ \
-                                              numpy.logical_not(numpy.isnan(md.diagnostic.spcvz))==3, \
+                fullspcnodes=numpy.logical_or(numpy.logical_not(numpy.isnan(md.diagnostic.spcvx)).astype(int)+ \
+                                              numpy.logical_not(numpy.isnan(md.diagnostic.spcvy)).astype(int)+ \
+                                              numpy.logical_not(numpy.isnan(md.diagnostic.spcvz)).astype(int)==3, \
                                               numpy.logical_and(nodeonpattyn,nodeonstokes)).astype(int)    #find all the nodes on the boundary of the domain without icefront
 #               fullspcelems=double(sum(fullspcnodes(md.mesh.elements),2)==6);         %find all the nodes on the boundary of the domain without icefront