Changeset 16464

Timestamp:

10/18/13 16:17:55 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added dafault outputs for masstransport

Location:

issm/trunk-jpl/src

Files:

• c/analyses/masstransport_core.cpp (modified) (1 diff)
• m/classes/masstransport.m (modified) (3 diffs)
• m/classes/masstransport.py (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/masstransport_core.cpp

@@ -78 +78 @@
         if(save_results){
                 if(VerboseSolution()) _printf0_("   saving results\n");
-                InputToResultx(femmodel,ThicknessEnum);
-                InputToResultx(femmodel,BedEnum);
-                InputToResultx(femmodel,SurfaceEnum);
-                femmodel->RequestedOutputsx(requested_outputs,numoutputs);
+                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
         }
 

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

@@ -60 +60 @@
                         end
                 end % }}}
+                function list=defaultoutputs(self,md) % {{{
+
+                        list = {'Thickness','Surface','Bed'};
+
+                end % }}}
                 function obj = setdefaultparameters(obj) % {{{
 
@@ -73 +78 @@
                         %Hydrostatic adjustment
                         obj.hydrostatic_adjustment='Absolute';
+
+                        %default output
+                        obj.requested_outputs={'default'};
                 end % }}}
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
@@ -109 +117 @@
                         WriteData(fid,'object',obj,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);
                         WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','StringArray');
+                        
+                        %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',MasstransportRequestedOutputsEnum,'format','StringArray');
                 end % }}}
         end

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

@@ -38 +38 @@
                 return string
                 #}}}
+        def defaultoutputs(self,md): # {{{
+
+                return ['Thickness','Surface','Bed']
+
+        #}}}
         def setdefaultparameters(self): # {{{
                 
@@ -52 +57 @@
                 self.hydrostatic_adjustment='Absolute'
 
+                #default output
+                self.requested_outputs=['default']
                 return self
         #}}}
@@ -77 +84 @@
                 WriteData(fid,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3)
                 WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double')
-                WriteData(fid,'object',self,'fieldname','requested_outputs','format','StringArray');
+
+                #process requested outputs
+                outputs = self.requested_outputs
+                indices = [i for i, x in enumerate(outputs) if x == 'default']
+                if len(indices) > 0:
+                        outputscopy=outputs[0:max(0,indices[0]-1)]+self.defaultoutputs(md)+outputs[indices[0]+1:]
+                        outputs    =outputscopy
+                WriteData(fid,'data',outputs,'enum',MasstransportRequestedOutputsEnum(),'format','StringArray')
         # }}}