Changeset 25836 for issm/trunk/test/Par/ValleyGlacierShelf.par

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/ValleyGlacierShelf.par (modified) (2 diffs)

issm/trunk/test/Par/ValleyGlacierShelf.par

@@ -26 +26 @@
 %Mask
 md.mask.ice_levelset = x - alpha*Lx;
-md.mask.groundedice_levelset = ones(md.mesh.numberofvertices,1);
+md.mask.ocean_levelset = ones(md.mesh.numberofvertices,1);
 
 %Initial velocity 
@@ -55 +55 @@
 %Friction
 md.friction.coefficient = 20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.)) = 0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.)) = 0.;
 md.friction.p = ones(md.mesh.numberofelements,1);
 md.friction.q = ones(md.mesh.numberofelements,1);