Changeset 20548 for issm/trunk/examples/IceBridge/Greenland_noOIB.par

Timestamp:

04/25/16 10:08:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 20546

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• examples/IceBridge/Greenland_noOIB.par (modified) (1 diff)

issm/trunk/examples/IceBridge/Greenland_noOIB.par

@@ -40 +40 @@
 
 disp('   Interpolating surface mass balance');
-md.surfaceforcings.mass_balance=InterpFromGridToMesh(x1,y1,smb,md.mesh.x,md.mesh.y,0);
-md.surfaceforcings.mass_balance=md.surfaceforcings.mass_balance*md.materials.rho_water/md.materials.rho_ice;
+md.smb.mass_balance=InterpFromGridToMesh(x1,y1,smb,md.mesh.x,md.mesh.y,0);
+md.smb.mass_balance=md.smb.mass_balance*md.materials.rho_water/md.materials.rho_ice;
 
 disp('   Construct basal friction parameters');