Changeset 25309

Timestamp:

07/29/20 02:54:40 (5 years ago)

Author:

bdef

Message:

BUG: fixing failures (not errors)

File:

• issm/trunk-jpl/test/Par/SquareShelf.py (modified) (2 diffs)

issm/trunk-jpl/test/Par/SquareShelf.py

@@ -45 +45 @@
 [md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
 x = y = vx = vy = index = None
-md.initialization.vz = np.zeros((md.mesh.numberofvertices, 1))
-md.initialization.pressure = np.zeros((md.mesh.numberofvertices, 1))
+md.initialization.vz = np.zeros((md.mesh.numberofvertices))
+md.initialization.pressure = np.zeros((md.mesh.numberofvertices))
 
 #dbg - begin
@@ -60 +60 @@
 
 # Materials
-md.initialization.temperature = (273 - 20) * np.ones((md.mesh.numberofvertices, 1))
+md.initialization.temperature = (273 - 20) * np.ones((md.mesh.numberofvertices))
 md.materials.rheology_B = paterson(md.initialization.temperature)
-md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements, 1))
+md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements))
 
 # Friction
-md.friction.coefficient = 20 * np.ones((md.mesh.numberofvertices, 1))
+md.friction.coefficient = 20 * np.ones((md.mesh.numberofvertices))
 md.friction.coefficient[np.where(md.mask.ocean_levelset < 0)[0]] = 0
-md.friction.p = np.ones((md.mesh.numberofelements, 1))
-md.friction.q = np.ones((md.mesh.numberofelements, 1))
+md.friction.p = np.ones((md.mesh.numberofelements))
+md.friction.q = np.ones((md.mesh.numberofelements))
 
 # Numerical parameters