Changeset 20505

Timestamp:

04/13/16 12:37:21 (9 years ago)

Author:

jbondzio

Message:

BUG: balancethickness works only in 2D, so do not attempt to collapse it from 3D

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.m (modified) (1 diff)
• model.py (modified) (1 diff)

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

@@ -208 +208 @@
                                 md.smb.smbref=project2d(md,md.smb.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;
 
                         %results

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

@@ -687 +687 @@
                         md.smb.mass_balance=project2d(md,md.smb.mass_balance,md.mesh.numberoflayers) 
                 
-                if not numpy.isnan(md.balancethickness.thickening_rate).all(): md.balancethickness.thickening_rate=project2d(md,md.balancethickness.thickening_rate,md.mesh.numberoflayers) 
-
                 #results
                 if not numpy.isnan(md.initialization.vx).all(): md.initialization.vx=DepthAverage(md,md.initialization.vx)