Changeset 11577 for issm/branches/trunk-jpl-damage/src/m/model/extrude.m

Timestamp:

02/29/12 13:35:30 (13 years ago)

Author:

cborstad

Message:

merged changes up to r11576 from trunk-jpl into branch

Location:

issm/branches/trunk-jpl-damage

Files:

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

issm/branches/trunk-jpl-damage

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

issm/branches/trunk-jpl-damage/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');
 
@@ -217 +216 @@
 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;
+if ~isnan(md.inversion.min_parameters),md.inversion.min_parameters=project3d(md,'vector',md.inversion.min_parameters,'type','node');end;
+if ~isnan(md.inversion.max_parameters),md.inversion.max_parameters=project3d(md,'vector',md.inversion.max_parameters,'type','node');end;
 if ~isnan(md.qmu.partition),md.qmu.partition=project3d(md,'vector',md.qmu.partition','type','node');end
 

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog