Changeset 963

Timestamp:

06/12/09 15:32:26 (16 years ago)

Author:

Eric.Larour

Message:

Reorganized qmu routines to include serial and parallel qmu now

Location:

issm/trunk/src/m/solutions

Files:

• cielo/SpawnCore.m (modified) (2 diffs)
• cielo/diagnostic.m (modified) (2 diffs)
• dakota/dakota_out_parse.m (modified) (1 diff)
• dakota/postqmu.m (added)
• dakota/preqmu.m (added)
• dakota/qmu.m (deleted)
• dakota/qmuisdistributed.m (added)
• dakota/qmumarshall.m (modified) (1 diff)
• dakota/qmuoutput.m (deleted)
• dakota/qmuresponse.m (added)
• dakota/qmuroot.m (added)

issm/trunk/src/m/solutions/cielo/SpawnCore.m

@@ -53 +53 @@
 end
 
+%process results
+results=processresults(models,results);
+
 %now process the results to get response function values
 responses=zeros(numel(responsedescriptors),1);
@@ -59 +62 @@
         responses(i)=qmuresponse(models,results,descriptor);
 end
-

issm/trunk/src/m/solutions/cielo/diagnostic.m

@@ -36 +36 @@
                 %launch core of diagnostic solution.
                 results=diagnostic_core(models,inputs);
+        
+                %process results
+                md.results.diagnostic=processresults(models,results);
         else
                 %launch dakota driver for diagnostic core solution
@@ -41 +44 @@
         end
 
-        md.results.diagnostic=processresults(models,results);
-
         %stop timing
         t2=clock;

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

@@ -183 +183 @@
 %  draw box plot
 
-figure
-subplot(2,1,1)
-plot_boxplot(dresp);
+%figure
+%subplot(2,1,1)
+%plot_boxplot(dresp);
 
 %  draw normal probability plot
 
-subplot(2,1,2)
-plot_normplot(dresp);
+%subplot(2,1,2)
+%plot_normplot(dresp);
 
 end

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

@@ -71 +71 @@
 %write npart to disk
 WriteData(fid,md.npart,'Integer','npart');
+
+%write ivar and iresp to disk
+WriteData(fid,md.ivar,'Integer','ivar');
+WriteData(fid,md.iresp,'Integer','iresp');
         
 %close file