Changeset 21544

Timestamp:

02/10/17 10:52:19 (8 years ago)

Author:

Mathieu Morlighem

Message:

BUG: keep old gia class

Location:

issm/trunk-jpl/src/m/classes

Files:

• model.m (modified) (4 diffs)
• oldclasses/gia.m (added)

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

@@ -40 +40 @@
                 levelset                          = 0;
                 calving          = 0;
-                giaivins              = 0;
+                giaivins         = 0;
                 esa              = 0;
 
@@ -245 +245 @@
                         md.stressbalance.loadingforce=project2d(md,md.stressbalance.loadingforce,md.mesh.numberoflayers);
                         md.masstransport.spcthickness=project2d(md,md.masstransport.spcthickness,md.mesh.numberoflayers);
-                        if ~isnan(md.damage.spcdamage), md.damage.spcdamage=project2d(md,md.damage.spcdamage,md.mesh.numberoflayers); end
+                        if numel(md.damage.spcdamage)>1, md.damage.spcdamage=project2d(md,md.damage.spcdamage,md.mesh.numberoflayers); end
                         if numel(md.levelset.spclevelset)>1, md.levelset.spclevelset=project2d(md,md.levelset.spclevelset,md.mesh.numberoflayers); end
                         md.thermal.spctemperature=project2d(md,md.thermal.spctemperature,md.mesh.numberoflayers);
-                        md.damage.spcdamage=project2d(md,md.damage.spcdamage,md.mesh.numberoflayers);
 
                         % Hydrologydc variables
@@ -1112 +1111 @@
                         md.levelset                       = levelset();
                         md.calving          = calving();
-                        md.giaivins              = giaivins();
+                        md.giaivins         = giaivins();
                         md.esa              = esa();
                         md.autodiff         = autodiff();
@@ -1282 +1281 @@
                         disp(sprintf('%19s: %-22s -- %s','steadystate'     ,['[1x1 ' class(self.steadystate) ']'],'parameters for steadystate solution'));
                         disp(sprintf('%19s: %-22s -- %s','transient'       ,['[1x1 ' class(self.transient) ']'],'parameters for transient solution'));
-                        disp(sprintf('%19s: %-22s -- %s','levelset'         ,['[1x1 ' class(self.levelset) ']'],'parameters for moving boundaries (level-set method)'));
+                        disp(sprintf('%19s: %-22s -- %s','levelset'        ,['[1x1 ' class(self.levelset) ']'],'parameters for moving boundaries (level-set method)'));
                         disp(sprintf('%19s: %-22s -- %s','calving'         ,['[1x1 ' class(self.calving) ']'],'parameters for calving'));
-                        disp(sprintf('%19s: %-22s -- %s','giaivins'             ,['[1x1 ' class(self.giaivins) ']'],'parameters for giaivins solution'));
+                        disp(sprintf('%19s: %-22s -- %s','giaivins'        ,['[1x1 ' class(self.giaivins) ']'],'parameters for giaivins solution'));
                         disp(sprintf('%19s: %-22s -- %s','esa'             ,['[1x1 ' class(self.esa) ']'],'parameters for elastic adjustment solution'));
                         disp(sprintf('%19s: %-22s -- %s','autodiff'        ,['[1x1 ' class(self.autodiff) ']'],'automatic differentiation parameters'));