Changeset 25836 for issm/trunk/test/Par/Pig.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/Pig.py (modified) (2 diffs)

issm/trunk/test/Par/Pig.py

@@ -20 +20 @@
 bed = np.array(archread('../Data/Pig.arch', 'bed'))
 
-md.inversion.vx_obs = InterpFromMeshToMesh2d(index, x, y, vx_obs, md.mesh.x, md.mesh.y)[0][:, 0]
-md.inversion.vy_obs = InterpFromMeshToMesh2d(index, x, y, vy_obs, md.mesh.x, md.mesh.y)[0][:, 0]
-md.geometry.surface = InterpFromMeshToMesh2d(index, x, y, surface, md.mesh.x, md.mesh.y)[0][:, 0]
-md.geometry.thickness = InterpFromMeshToMesh2d(index, x, y, thickness, md.mesh.x, md.mesh.y)[0][:, 0]
+md.inversion.vx_obs = InterpFromMeshToMesh2d(index, x, y, vx_obs, md.mesh.x, md.mesh.y)[:, 0]
+md.inversion.vy_obs = InterpFromMeshToMesh2d(index, x, y, vy_obs, md.mesh.x, md.mesh.y)[:, 0]
+md.geometry.surface = InterpFromMeshToMesh2d(index, x, y, surface, md.mesh.x, md.mesh.y)[:, 0]
+md.geometry.thickness = InterpFromMeshToMesh2d(index, x, y, thickness, md.mesh.x, md.mesh.y)[:, 0]
 md.geometry.base = md.geometry.surface - md.geometry.thickness
 md.geometry.bed = np.array(md.geometry.base)
-pos = np.where(md.mask.groundedice_levelset < 0.)
-md.geometry.bed[pos] = InterpFromMeshToMesh2d(index, x, y, bed, md.mesh.x[pos], md.mesh.y[pos])[0][:, 0]
+pos = np.where(md.mask.ocean_levelset < 0.)
+md.geometry.bed[pos] = InterpFromMeshToMesh2d(index, x, y, bed, md.mesh.x[pos], md.mesh.y[pos])[:, 0]
 md.initialization.vx = md.inversion.vx_obs
 md.initialization.vy = md.inversion.vy_obs
@@ -41 +41 @@
 #Friction
 md.friction.coefficient = 50. * 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))