Changeset 16160

Timestamp:

09/17/13 16:38:06 (12 years ago)

Author:

Eric.Larour

Message:

NEW: starting to implement a damage class

Location:

issm/trunk-jpl/src/m/classes

Files:

• damage.m (added)
• matdamageice.m (modified) (1 diff)
• model/model.m (modified) (6 diffs)

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

@@ -163 +163 @@
                         fielddisplay(obj,'damage_D','damage tensor (scalar)');
                         fielddisplay(obj,'damage_law','damage law (string) from {''initial''}');
-                        if strcmpi(obj.damage_law),
+                        if strcmpi(obj.damage_law,'initial'),
                                 fielddisplay(obj,'damage_c1','damage parameter 1');
                                 fielddisplay(obj,'damage_c2','damage parameter 2');

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

@@ -16 +16 @@
                 basalforcings    = 0;
                 materials        = 0;
+                damage           = 0;
                 friction         = 0;
                 flowequation     = 0;
@@ -187 +188 @@
                         md.materials.rheology_B=DepthAverage(md,md.materials.rheology_B);
                         md.materials.rheology_n=project2d(md,md.materials.rheology_n,1);
-                        if isa(md.materials,'matdamageice')
-                                md.materials.rheology_Z=DepthAverage(md,md.materials.rheology_Z);
-                        end
+                        
+                        %damage: 
+                        md.damage.D=DepthAverage(md,md.damage.D);
 
                         %special for thermal modeling:
@@ -718 +719 @@
                         md.materials.rheology_B=project3d(md,'vector',md.materials.rheology_B,'type','node');
                         md.materials.rheology_n=project3d(md,'vector',md.materials.rheology_n,'type','element');
-                        if isa(md.materials,'matdamageice')
-                                md.materials.rheology_Z=project3d(md,'vector',md.materials.rheology_Z,'type','node');
-                        end
+                                
+                        %damage
+                        md.damage.D=project3d(md,'vector',md.damage.D,'type','node');
 
                         %parameters
@@ -831 +832 @@
                         if isfield(structmd,'rheology_B'), md.materials.rheology_B=structmd.rheology_B; end
                         if isfield(structmd,'rheology_n'), md.materials.rheology_n=structmd.rheology_n; end
+                        if isfield(structmd,'rheology_Z'), md.damage.D=(1-structmd.rheology_Z); end
                         if isfield(structmd,'spcthickness'), md.balancethickness.spcthickness=structmd.spcthickness; end
                         if isfield(structmd,'artificial_diffusivity'), md.balancethickness.stabilization=structmd.artificial_diffusivity; end
@@ -1047 +1049 @@
                         md.groundingline    = groundingline();
                         md.materials        = matice();
+                        md.damage           = damage();
                         md.flowequation     = flowequation();
                         md.debug            = debug();
@@ -1079 +1082 @@
                         disp(sprintf('%19s: %-22s -- %s','basalforcings'   ,['[1x1 ' class(obj.basalforcings) ']'],'bed forcings'));
                         disp(sprintf('%19s: %-22s -- %s','materials'       ,['[1x1 ' class(obj.materials) ']'],'material properties'));
+                        disp(sprintf('%19s: %-22s -- %s','damage'          ,['[1x1 ' class(obj.damage) ']'],'damage propagation laws'));
                         disp(sprintf('%19s: %-22s -- %s','friction'        ,['[1x1 ' class(obj.friction) ']'],'basal friction/drag properties'));
                         disp(sprintf('%19s: %-22s -- %s','flowequation'    ,['[1x1 ' class(obj.flowequation) ']'],'flow equations'));