Changeset 804 for issm/trunk/src/m/classes/public/loadresultsfromdisk.m

Timestamp:

06/04/09 18:08:18 (16 years ago)

Author:

Eric.Larour

Message:

Stabilized dakota pluging in core dakota solution

File:

• issm/trunk/src/m/classes/public/loadresultsfromdisk.m (modified) (1 diff)

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

@@ -12 +12 @@
 
 %load result onto model
-if isnan(md.results), md.results=struct(); end 
+if ~isstruct(md.results),
+        if isnan(md.results), md.results=struct(); end 
+end
 eval(['md.results.' md.analysis_type '=parseresultsfromdisk(filename);']);
 
-%Check result is consistent
-disp(sprintf('%s\n','checking result consistency'));
-if ~isresultconsistent(md,md.analysis_type),
-        %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
-        disp('!! results not consistent correct the model !!') 
+%Check result is consistent, only if it exists
+if ~isempty(md.results.diagnostic),
+        disp(sprintf('%s\n','checking result consistency'));
+        if ~isresultconsistent(md,md.analysis_type),
+                %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
+                disp('!! results not consistent correct the model !!') 
+        end
 end
+
+%deal with qmu results
+if md.qmu_analysis, 
+        md=qmuoutput(md,md.name,'qmu');
+end