Changeset 24439

Timestamp:

12/05/19 16:55:26 (5 years ago)

Author:

Eric.Larour

Message:

CHG: added output option in the qmu class, to output as many outbins as we run samples.

Location:

issm/trunk-jpl/src/m

Files:

• classes/qmu.m (modified) (3 diffs)
• qmu/postqmu.m (modified) (1 diff)
• solve/loadresultsfromcluster.m (modified) (1 diff)

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

@@ -7 +7 @@
         properties (SetAccess=public) 
                 isdakota                    = 0;
+                output                      = 0;
                 variables                   = struct();
                 responses                   = struct();
@@ -97 +98 @@
 
                         fielddisplay(self,'isdakota','is qmu analysis activated?');
+                        fielddisplay(self,'output','are we outputting ISSM results, default is 0');
                         for i=1:numel(self.variables)
                                 disp(sprintf('         variables%s:  (arrays of each variable class)',...
@@ -175 +177 @@
                 function marshall(self,prefix,md,fid) % {{{
                         WriteData(fid,prefix,'object',self,'fieldname','isdakota','format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','output','format','Boolean');
                         if ~self.isdakota, 
                                 WriteData(fid,prefix,'data',false,'name','md.qmu.mass_flux_segments_present','format','Boolean');

issm/trunk-jpl/src/m/qmu/postqmu.m

@@ -40 +40 @@
 end
 
+if md.qmu.output,
+        if strcmpi(md.qmu.method.method,'nond_sampling'),
+                dakotaresults.modelresults={};
+                md2=md; md2.qmu.isdakota=0;
+                for i=1:md2.qmu.method.params.samples,
+                        md2=loadresultsfromdisk(md2,[md2.miscellaneous.name '.outbin.' num2str(i)]);
+                        dakotaresults.modelresults{end+1}=md2.results;
+                end
+        end
+end
+
+
 %put dakotaresults in their right location.
 md.results.dakota=dakotaresults;

issm/trunk-jpl/src/m/solve/loadresultsfromcluster.m

@@ -28 +28 @@
                 if md.qmu.params.tabular_graphics_data==true,
                         filelist{end+1}='dakota_tabular.dat';
+                end
+        end
+        if md.qmu.output,
+                if strcmpi(md.qmu.method.method,'nond_sampling'),
+                        for i=1:md.qmu.method.params.samples
+                                filelist{end+1}=[md.miscellaneous.name '.outbin.' num2str(i)];
+                        end
                 end
         end