Changeset 25836 for issm/trunk/test/Par/SquareShelf2.py

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/Par/SquareShelf2.py (modified) (2 diffs)

issm/trunk/test/Par/SquareShelf2.py

@@ -32 +32 @@
 #dbg - end
 
-[md.initialization.vx] = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)
-[md.initialization.vy] = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
+md.initialization.vx = InterpFromMeshToMesh2d(index, x, y, vx, md.mesh.x, md.mesh.y)
+md.initialization.vy = InterpFromMeshToMesh2d(index, x, y, vy, md.mesh.x, md.mesh.y)
 md.initialization.vz = np.zeros((md.mesh.numberofvertices))
 md.initialization.pressure = np.zeros((md.mesh.numberofvertices))
@@ -56 +56 @@
 #Friction
 md.friction.coefficient = 20. * np.ones((md.mesh.numberofvertices))
-md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
+md.friction.coefficient[np.nonzero(md.mask.ocean_levelset < 0.)[0]] = 0.
 md.friction.p = np.ones((md.mesh.numberofelements))
 md.friction.q = np.ones((md.mesh.numberofelements))