Changeset 16560 for issm/trunk/src/m/classes/transient.m

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/transient.m (modified) (5 diffs)

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

@@ -11 +11 @@
                 isgroundingline   = 0;
                 isgia             = 0;
-                requested_outputs = NaN;
+                isdamage             = 0;
+                requested_outputs = {};
         end
         methods
@@ -25 +26 @@
 
                         %full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now
-                        obj.ismasstransport=1;
-                        obj.isstressbalance=1;
-                        obj.isthermal=1;
-                        obj.isgroundingline=0;
-                        obj.isgia=0;
+                        obj.ismasstransport = 1;
+                        obj.isstressbalance = 1;
+                        obj.isthermal       = 1;
+                        obj.isgroundingline = 0;
+                        obj.isgia           = 0;
+                        obj.isdamage        = 0;
+
+                        %default output
+                        obj.requested_outputs={'default'};
+                end % }}}
+                function list = defaultoutputs(self,md) % {{{
+
+                        list = {'SurfaceforcingsMassBalance'};
 
                 end % }}}
@@ -42 +51 @@
                         md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0 1]);
                         md = checkfield(md,'transient.isgia','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'transient.requested_outputs','size',[NaN 1]);
+                        md = checkfield(md,'transient.isdamage','numel',[1],'values',[0 1]);
+                        md = checkfield(md,'transient.requested_outputs','stringrow',1);
 
                 end % }}}
@@ -48 +58 @@
                         disp(sprintf('   transient solution parameters:'));
 
-                        fielddisplay(obj,'ismasstransport','indicates if a masstransport solution is used in the transient');
-                        fielddisplay(obj,'isstressbalance','indicates if a stressbalance solution is used in the transient');
-                        fielddisplay(obj,'isthermal','indicates if a thermal solution is used in the transient');
-                        fielddisplay(obj,'isgroundingline','indicates if a groundingline migration is used in the transient');
-                        fielddisplay(obj,'isgia','indicates if a postglacial rebound model is used in the transient');
+                        fielddisplay(obj,'ismasstransport','indicates whether a masstransport solution is used in the transient');
+                        fielddisplay(obj,'isstressbalance','indicates whether a stressbalance solution is used in the transient');
+                        fielddisplay(obj,'isthermal','indicates whether a thermal solution is used in the transient');
+                        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,'requested_outputs','list of additional outputs requested');
 
@@ -62 +73 @@
                         WriteData(fid,'object',obj,'fieldname','isgroundingline','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'fieldname','isdamage','format','Boolean');
+
+                        %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',TransientRequestedOutputsEnum,'format','StringArray');
                 end % }}}
         end