Changeset 17644

Timestamp:

04/03/14 22:07:05 (11 years ago)

Author:

cborstad

Message:

BUG: fixed a couple bugs in matlab code for damage evolution analysis in transient

Location:

issm/trunk-jpl/src/m/classes

Files:

• damage.m (modified) (1 diff)
• transient.m (modified) (5 diffs)

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

@@ -175 +175 @@
                                 WriteData(fid,'object',obj,'fieldname','healing','format','Double');
                                 WriteData(fid,'object',obj,'fieldname','equiv_stress','format','Integer');
-                                        
-                                %process requested outputs
-                                outputs = obj.requested_outputs;
-                                pos = find(ismember(outputs,'default'));
-                                if ~isempty(pos),
-                                        outputs(pos) = [];                         %remove 'default' from outputs
-                                        outputs      = [outputs defaultoutputs(obj,md)]; %add defaults
-                                end
-                                WriteData(fid,'data',outputs,'enum',DamageEvolutionRequestedOutputsEnum,'format','StringArray');
                         end
+
+                        %process requested outputs
+                        outputs = obj.requested_outputs;
+                        pos = find(ismember(outputs,'default'));
+                        if ~isempty(pos),
+                                outputs(pos) = [];                         %remove 'default' from outputs
+                                outputs      = [outputs defaultoutputs(obj,md)]; %add defaults
+                        end
+                        WriteData(fid,'data',outputs,'enum',DamageEvolutionRequestedOutputsEnum,'format','StringArray');
 
                 end % }}}

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

@@ -11 +11 @@
                 isgroundingline   = 0;
                 isgia             = 0;
-                isdamage          = 0;
+                isdamageevolution = 0;
                 islevelset        = 0;
                 requested_outputs = {};
@@ -32 +32 @@
                         obj.isgroundingline = 0;
                         obj.isgia           = 0;
-                        obj.isdamage        = 0;
+                        obj.isdamageevolution = 0;
                         obj.islevelset      = 0;
 
@@ -55 +55 @@
                         md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'fieldname','transient.isdamage','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0 1]);
                         md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
@@ -68 +68 @@
                         fielddisplay(obj,'isgroundingline','indicates whether a groundingline migration is used in the transient');
                         fielddisplay(obj,'isgia','indicates whether a postglacial rebound model is used in the transient');
-                        fielddisplay(obj,'isdamage','indicates whether damage evolution is used in the transient');
+                        fielddisplay(obj,'isdamageevolution','indicates whether damage evolution is used in the transient');
                         fielddisplay(obj,'islevelset','LEVEL SET DESCRIPTION...');
                         fielddisplay(obj,'requested_outputs','list of additional outputs requested');
@@ -79 +79 @@
                         WriteData(fid,'object',obj,'fieldname','isgroundingline','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','isdamage','format','Boolean');
+                        WriteData(fid,'object',obj,'fieldname','isdamageevolution','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','islevelset','format','Boolean');