Changeset 13970

Timestamp:

11/15/12 14:54:27 (12 years ago)

Author:

cborstad

Message:

BUG: catch rank-1 arrays in SetIceShelfBC and reshape to match spc arrays

File:

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

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

@@ -42 +42 @@
         #Dirichlet Values
         if isinstance(md.inversion.vx_obs,numpy.ndarray) and numpy.size(md.inversion.vx_obs,axis=0)==md.mesh.numberofvertices and isinstance(md.inversion.vy_obs,numpy.ndarray) and numpy.size(md.inversion.vy_obs,axis=0)==md.mesh.numberofvertices:
+                #reshape to rank-2 if necessary to match spc arrays
+                if numpy.ndim(md.inversion.vx_obs)==1:
+                        md.inversion.vx_obs=md.inversion.vx_obs.reshape(-1,1)
+                if numpy.ndim(md.inversion.vy_obs)==1:
+                        md.inversion.vy_obs=md.inversion.vy_obs.reshape(-1,1)
                 print "      boundary conditions for diagnostic model: spc set as observed velocities"
                 md.diagnostic.spcvx[pos]=md.inversion.vx_obs[pos]