Changeset 11527 for issm/trunk/src/m/model/extrude.m

Timestamp:

02/24/12 08:12:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11526

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src/m (modified) (1 prop)
• src/m/model (modified) (1 prop)
• src/m/model/extrude.m (modified) (3 diffs)

issm/trunk/src/m/model/extrude.m

@@ -137 +137 @@
 md.inversion.vel_obs=project3d(md,'vector',md.inversion.vel_obs,'type','node');
 md.surfaceforcings.mass_balance=project3d(md,'vector',md.surfaceforcings.mass_balance,'type','node');
-md.surfaceforcings.accumulation_rate=project3d(md,'vector',md.surfaceforcings.accumulation_rate,'type','node');
-md.surfaceforcings.ablation_rate=project3d(md,'vector',md.surfaceforcings.ablation_rate,'type','node');
+md.surfaceforcings.precipitation=project3d(md,'vector',md.surfaceforcings.precipitation,'type','node');
 md.balancethickness.thickening_rate=project3d(md,'vector',md.balancethickness.thickening_rate,'type','node');
 
@@ -194 +193 @@
 for i=2:numlayers-1,
         md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)...
-        =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d;
+                =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d;
 end
 md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0;
@@ -216 +215 @@
 md.mask.vertexonwater=project3d(md,'vector',md.mask.vertexonwater,'type','node');
 if ~isnan(md.inversion.cost_functions_coefficients),md.inversion.cost_functions_coefficients=project3d(md,'vector',md.inversion.cost_functions_coefficients,'type','node');end;
-
-%Put lithostatic pressure is there is an existing pressure
+if ~isnan(md.qmu.partition),md.qmu.partition=project3d(md,'vector',md.qmu.partition','type','node');end
+
+%Put lithostatic pressure if there is an existing pressure
 if ~isnan(md.initialization.pressure),
         md.initialization.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.z);