Changeset 13462 for issm/trunk-jpl/src/m/parameterization/setflowequation.py

Timestamp:

09/27/12 09:44:58 (12 years ago)

Author:

jschierm

Message:

CHG: Changed all data 1-d vectors to 2-d arrays to allow multiple columns.

File:

• issm/trunk-jpl/src/m/parameterization/setflowequation.py (modified) (2 diffs)

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

@@ -94 +94 @@
                                               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
+                                              numpy.logical_and(nodeonpattyn,nodeonstokes).reshape(-1,1)).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
                 fullspcelems=(numpy.sum(fullspcnodes[md.mesh.elements.astype(int)-1],axis=1)==6).astype(int)    #find all the nodes on the boundary of the domain without icefront
-                stokesflag[numpy.nonzero(fullspcelems)]=0
+                stokesflag[numpy.nonzero(fullspcelems.reshape(-1))]=0
                 nodeonstokes[md.mesh.elements[numpy.nonzero(stokesflag),:].astype(int)-1]=1
 
@@ -129 +129 @@
                         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)
+                                penalties=numpy.vstack((penalties,numpy.hstack((bordernodes2d,bordernodes2d+md.mesh.numberofvertices2d*(i)))))
                         md.diagnostic.vertex_pairing=penalties