Changeset 19123

Timestamp:

02/19/15 08:39:39 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: collapse needs to be object oriented again...

File:

• issm/trunk-jpl/src/m/classes/model.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/model.m

@@ -198 +198 @@
                         if numel(md.inversion.min_parameters)>1, md.inversion.min_parameters=project2d(md,md.inversion.min_parameters,md.mesh.numberoflayers); end;
                         if numel(md.inversion.max_parameters)>1, md.inversion.max_parameters=project2d(md,md.inversion.max_parameters,md.mesh.numberoflayers); end;
-                        if ~isnan(md.surfaceforcings.mass_balance),
+                        if isa(md.surfaceforcings,'SMB') & ~isnan(md.surfaceforcings.mass_balance),
                                 md.surfaceforcings.mass_balance=project2d(md,md.surfaceforcings.mass_balance,md.mesh.numberoflayers); 
+                        elseif isa(md.surfaceforcings,'SMBhenning') & ~isnan(md.surfaceforcings.smbref),
+                                md.surfaceforcings.smbref=project2d(md,md.surfaceforcings.smbref,md.mesh.numberoflayers);
                         end;
                         if ~isnan(md.balancethickness.thickening_rate), md.balancethickness.thickening_rate=project2d(md,md.balancethickness.thickening_rate,md.mesh.numberoflayers); end;