Changeset 23829

Timestamp:

04/07/19 20:26:25 (6 years ago)

Author:

Mathieu Morlighem

Message:

NEW: fixed Pig calving law now that we need the bed

Location:

issm/trunk-jpl/test

Files:

• NightlyRun/test540.m (modified) (1 diff)
• NightlyRun/test540.py (modified) (1 diff)
• Par/Pig.par (modified) (3 diffs)

issm/trunk-jpl/test/NightlyRun/test540.m

@@ -12 +12 @@
 md.frontalforcings.meltingrate = zeros(md.mesh.numberofvertices,1);
 md.transient.ismovingfront = 1;
+md.transient.isgroundingline = 1;
 md.levelset.spclevelset = NaN(md.mesh.numberofvertices,1);
 pos = find(md.mesh.vertexonboundary);

issm/trunk-jpl/test/NightlyRun/test540.py

@@ -21 +21 @@
 md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,))
 md.transient.ismovingfront = 1
+md.transient.isgroundingline = 1
 md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices,))
 pos = np.where(md.mesh.vertexonboundary)

issm/trunk-jpl/test/Par/Pig.par

@@ -9 +9 @@
 surface   = archread('../Data/Pig.arch','surface');
 thickness = archread('../Data/Pig.arch','thickness');
+bed       = archread('../Data/Pig.arch','bed');
 
 x                        = x{1};
@@ -17 +18 @@
 surface  = surface{1};
 thickness = thickness{1};
+bed       = bed{1};
 
 md.inversion.vx_obs   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.mesh.x,md.mesh.y);
@@ -23 +25 @@
 md.geometry.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y);
 md.geometry.base=md.geometry.surface-md.geometry.thickness;
+md.geometry.bed =md.geometry.base;
+pos = find(md.mask.groundedice_levelset<0);
+md.geometry.bed(pos) =InterpFromMeshToMesh2d(index,x,y,bed,md.mesh.x(pos),md.mesh.y(pos));
 clear surface thickness vx_obs vy_obs x y index;
 md.initialization.vx=md.inversion.vx_obs;