Index: /issm/trunk/src/m/classes/public/loadresultsfromcluster.m
===================================================================
--- /issm/trunk/src/m/classes/public/loadresultsfromcluster.m	(revision 2900)
+++ /issm/trunk/src/m/classes/public/loadresultsfromcluster.m	(revision 2901)
@@ -37,13 +37,23 @@
 
 %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
 
Index: /issm/trunk/src/m/classes/public/loadresultsfromdisk.m
===================================================================
--- /issm/trunk/src/m/classes/public/loadresultsfromdisk.m	(revision 2900)
+++ /issm/trunk/src/m/classes/public/loadresultsfromdisk.m	(revision 2901)
@@ -12,29 +12,34 @@
 
 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
Index: /issm/trunk/src/m/classes/public/solveparallel.m
===================================================================
--- /issm/trunk/src/m/classes/public/solveparallel.m	(revision 2900)
+++ /issm/trunk/src/m/classes/public/solveparallel.m	(revision 2901)
@@ -26,5 +26,5 @@
 
 %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);