Changeset 9630

Timestamp:

09/06/11 15:57:21 (14 years ago)

Author:

Mathieu Morlighem

Message:

removed dakotain, dakotaout and dakotadat

Location:

issm/trunk/src/m

Files:

• classes/model/model.m (modified) (1 diff)
• model/display/displayqmu.m (modified) (1 diff)
• qmu/postqmu.m (modified) (1 diff)

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

@@ -209 +209 @@
                  qmu_params                      = modelfield('default',struct(),'marshall',false);
                  dakotaresults                   = modelfield('default',struct(),'marshall',false);
-                 dakotain                        = modelfield('default','','marshall',false);
-                 dakotaout                       = modelfield('default','','marshall',false);
-                 dakotadat                       = modelfield('default','','marshall',false);
                  dakota_analysis                    = modelfield('default',0,'marshall',true,'format','Boolean');
                  part                            = modelfield('default',NaN,'marshall',true,'format','DoubleMat','mattype',2);

issm/trunk/src/m/model/display/displayqmu.m

@@ -85 +85 @@
         end
 
-        if isempty(md.dakotain), disp(sprintf('         dakotain: N/A')); else disp(sprintf('         dakotain:    [%ix%i]    (can be accessed by typing md.dakotain)',size(md.dakotain)));end
-        if isempty(md.dakotaout), disp(sprintf('         dakotaout: N/A')); else disp(sprintf('         dakotaout:    [%ix%i]    (can be accessed by typing md.dakotaout)',size(md.dakotaout)));end
-        if isempty(md.dakotadat), disp(sprintf('         dakotadat: N/A')); else disp(sprintf('         dakotadat:    [%ix%i]    (can be accessed by typing md.dakotadat)',size(md.dakotadat)));end
         disp(sprintf('         npart   : %i (number of partitions for semi-descrete qmu)',md.npart));
         disp(sprintf('         part    : [%i] (user provided mesh partition, defaults to metis if not specified)',length(md.part)));

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

@@ -48 +48 @@
 md.results.dakota=dakotaresults;
 
-%save input and output files into model
-%md.dakotain =readfile([qmufile '.in']);
-%md.dakotaout=readfile(qmuoutfile);
-%if exist('dakota_tabular.dat','file')
-%       md.dakotadat=readfile('dakota_tabular.dat');
-%end
-
 %  move all the individual function evalutations into zip files
 if ~md.dakota_analysis,