Changeset 2051

Timestamp:

08/28/09 18:07:09 (16 years ago)

Author:

Eric.Larour

Message:

postqmu: now inputs results from qmu into md.results.dakota.
testsgetfields: now requests comparison of importancefactors for nighly runs of dakota;
tres: now transfers qmu_analysis results.

Location:

issm/trunk/src/m

Files:

• classes/public/tres.m (modified) (1 diff)
• solutions/dakota/postqmu.m (modified) (1 diff)
• utils/Nightly/testsgetfields.m (modified) (1 diff)

issm/trunk/src/m/classes/public/tres.m

@@ -16 +16 @@
                 md.riftproperties=md.results.diagnostic.riftproperties;
         end
+elseif strcmpi(string,'dakota'),
+        md.dakotaresults=md.results.dakota;
 elseif strcmpi(string,'steadystate'),
         md.vx=md.results.steadystate.vx;

issm/trunk/src/m/solutions/dakota/postqmu.m

@@ -32 +32 @@
 
 [method,dvar,dresp_in]=dakota_in_parse(qmuinfile);
-md.dakotaresults.method   =method;
-md.dakotaresults.dvar     =dvar;
-md.dakotaresults.dresp_in =dresp_in;
+dakotaresults.method   =method;
+dakotaresults.dvar     =dvar;
+dakotaresults.dresp_in =dresp_in;
 
 [method,dresp_out,scm,pcm,srcm,prcm]=dakota_out_parse(qmuoutfile);
-md.dakotaresults.dresp_out=dresp_out;
-md.dakotaresults.scm      =scm;
-md.dakotaresults.pcm      =pcm;
-md.dakotaresults.srcm     =srcm;
-md.dakotaresults.prcm     =prcm;
+dakotaresults.dresp_out=dresp_out;
+dakotaresults.scm      =scm;
+dakotaresults.pcm      =pcm;
+dakotaresults.srcm     =srcm;
+dakotaresults.prcm     =prcm;
 
 if exist('dakota_tabular.dat','file')
     [method,dresp_dat                  ]=dakota_out_parse('dakota_tabular.dat');
-    md.dakotaresults.dresp_dat=dresp_dat;
+    dakotaresults.dresp_dat=dresp_dat;
 end
+
+
+%put dakotaresults in their right location.
+results.dakota=dakotaresults;
+md.results=results;
 
 %save input and output files into model
 %md.dakotain =readfile([qmufile '.in']);
-%md.dakotaout=readfile([qmufile '.out']);
+md.dakotaout=readfile(qmuoutfile);
 %if exist('dakota_tabular.dat','file')
 %       md.dakotadat=readfile('dakota_tabular.dat');

issm/trunk/src/m/utils/Nightly/testsgetfields.m

@@ -16 +16 @@
         if md.control_analysis,
                 fields={'diagnostic.vel','diagnostic.J','diagnostic.parameter'};
+        elseif md.qmu_analysis,
+                fields={'dakota.importancefactors'};
         else
                 if strcmpi(md.type,'3d')