Changeset 15519

Timestamp:

07/19/13 08:09:35 (12 years ago)

Author:

cborstad

Message:

CHG: handle vectors vs. arrarys more consistently in python: in most places we use vectors

File:

• issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py (modified) (2 diffs)

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

@@ -32 +32 @@
 #       pos=find(md.mesh.vertexonboundary & ~nodeonicefront);
         pos=numpy.nonzero(numpy.logical_and(md.mesh.vertexonboundary,numpy.logical_not(nodeonicefront)))[0]
-        md.diagnostic.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-        md.diagnostic.spcvy=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
-        md.diagnostic.spcvz=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
+        md.diagnostic.spcvx=float('nan')*numpy.ones((md.mesh.numberofvertices,))
+        md.diagnostic.spcvy=float('nan')*numpy.ones((md.mesh.numberofvertices,))
+        md.diagnostic.spcvz=float('nan')*numpy.ones((md.mesh.numberofvertices,))
         md.diagnostic.spcvx[pos]=0
         md.diagnostic.spcvy[pos]=0
@@ -93 +93 @@
 
         if isinstance(md.initialization.temperature,numpy.ndarray) and numpy.size(md.initialization.temperature,axis=0)==md.mesh.numberofvertices:
-                md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
+                md.thermal.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,))
 #               pos=find(md.mesh.vertexonsurface); md.thermal.spctemperature(pos)=md.initialization.temperature(pos); %impose observed temperature on surface
                 pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
                 md.thermal.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface
                 if not isinstance(md.basalforcings.geothermalflux,numpy.ndarray) or not numpy.size(md.basalforcings.geothermalflux,axis=0)==md.mesh.numberofvertices:
-                        md.basalforcings.geothermalflux=numpy.zeros((md.mesh.numberofvertices,1))
+                        md.basalforcings.geothermalflux=numpy.zeros((md.mesh.numberofvertices,))
         else:
                 print "      no thermal boundary conditions created: no observed temperature found"