Changeset 2901

Timestamp:

01/25/10 08:12:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

some modifications for Dakota

Location:

issm/trunk/src/m/classes/public

Files:

• loadresultsfromcluster.m (modified) (1 diff)
• loadresultsfromdisk.m (modified) (1 diff)
• solveparallel.m (modified) (1 diff)

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

@@ -37 +37 @@
 
 %erase the log and output files
-delete([md.name '.outlog']);
-delete([md.name '.errlog']);
-delete([md.name '.outbin']);
+if md.qmu_analysis,
+        delete(['qmu/' md.name '.outlog']);
+        delete(['qmu/' md.name '.errlog']);
+else
+        delete([md.name '.outlog']);
+        delete([md.name '.errlog']);
+        delete([md.name '.outbin']);
+end
 
 %erase input file if run was carried out on same platform.
 hostname=oshostname();
 if strcmpi(hostname,md.cluster),
-        delete([md.name '.bin']);
-        delete([md.name '.queue']);
+        if md.qmu_analysis,
+                delete(['qmu/' md.name '.bin']);
+                delete(['qmu/' md.name '.queue']);
+        else
+                delete([md.name '.bin']);
+                delete([md.name '.queue']);
+        end
 end
 

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

@@ -12 +12 @@
 
 if ~md.qmu_analysis,
-        %load result onto model
+
+        %initialize md.results if not a structure yet
         if ~isstruct(md.results),
                 md.results=struct();
         end
 
+        %load results onto model
         structure=parseresultsfromdisk(filename);
         md.results.(structure.analysis_type)=structure;
+
+        %recover analysis_type from results
+        md.analysis_type=structure(1).analysis_type;
+        if isscalar(md.sub_analysis_type),
+                md.sub_analysis_type=AnalysisTypeFromEnum(md.sub_analysis_type);
+        end
 
         %Check result is consistent, only if it exists
         disp(sprintf('%s\n','checking result consistency'));
         if ~isresultconsistent(md,structure(1).analysis_type),
-                %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)
+                %it would be very cruel to use an error, it would kill the computed results (although they are not consistent...)
                 disp('!! results not consistent correct the model !!') 
         end
-end
-
-%recover analysis_type from results
-md.analysis_type=structure(1).analysis_type;
-if isscalar(md.sub_analysis_type),
-        md.sub_analysis_type=AnalysisTypeFromEnum(md.sub_analysis_type);
-end
 
 %post processes qmu results if necessary
-if md.qmu_analysis,
+else
+
+        md.analysis_type    =AnalysisTypeFromEnum(md.analysis_type);
+        md.sub_analysis_type=AnalysisTypeFromEnum(md.sub_analysis_type);
         md=postqmu(md);
         cd ..
+
 end

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

@@ -26 +26 @@
 
 %Do we return, or just wait for results?
-if md.waitonlock~=0 &  ~strcmpi(options.batch,'yes'),
+if (md.waitonlock~=0 &  ~strcmpi(options.batch,'yes')),
         %we wait for the done file
         islock=waitonlock(md,executionpath);