Changeset 17799

Timestamp:

04/22/14 08:21:12 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: bed is now base

Location:

issm/trunk-jpl/examples

Files:

• Jakobshavn/Jks.par (modified) (1 diff)
• Jakobshavn/runme.m (modified) (1 diff)
• SquareIceShelf/Square.par (modified) (1 diff)

issm/trunk-jpl/examples/Jakobshavn/Jks.par

@@ -22 +22 @@
 
 disp('   Interpolating bedrock topography');
-md.geometry.bed=InterpFromGridToMesh(x1,y1,topg,md.mesh.x,md.mesh.y,0);
+md.geometry.base = InterpFromGridToMesh(x1,y1,topg,md.mesh.x,md.mesh.y,0);
 
 disp('   Constructing surface elevation');
-md.geometry.surface=md.geometry.thickness+md.geometry.bed;
+md.geometry.surface=md.geometry.thickness+md.geometry.base;
 
 disp('   Interpolating velocities');

issm/trunk-jpl/examples/Jakobshavn/runme.m

@@ -1 @@
-steps=[2:3];
+steps=[1:3];
 
 if any(steps==1)

issm/trunk-jpl/examples/SquareIceShelf/Square.par

@@ -6 +6 @@
 ymin=min(md.mesh.y);
 ymax=max(md.mesh.y);
-md.geometry.thickness=hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
-md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
-md.geometry.surface=md.geometry.bed+md.geometry.thickness;
+md.geometry.thickness = hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin);
+md.geometry.base      = -md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
+md.geometry.surface   = md.geometry.base+md.geometry.thickness;
 
 disp('      creating drag');