Index: /issm/trunk/src/m/classes/public/loadresultsfromcluster.m
===================================================================
--- /issm/trunk/src/m/classes/public/loadresultsfromcluster.m	(revision 671)
+++ /issm/trunk/src/m/classes/public/loadresultsfromcluster.m	(revision 672)
@@ -34,3 +34,5 @@
 
 %erase the log and output files
-system(['rm -rf ' md.name '.outlog ' md.name '.errlog' md.name '.outbin']);
+system(['rm -rf ' md.name '.outlog ' md.name '.errlog ' md.name '.outbin ' md.name '.lock ']);
+%erase input files
+system(['rm -rf ' md.name '.bin ' md.name '.queue ']);
Index: /issm/trunk/src/m/classes/public/loadresultsfromdisk.m
===================================================================
--- /issm/trunk/src/m/classes/public/loadresultsfromdisk.m	(revision 671)
+++ /issm/trunk/src/m/classes/public/loadresultsfromdisk.m	(revision 672)
@@ -5,6 +5,5 @@
 %      md=loadresultsfromdisk(md,filename);
 
-%We convert all results to m/a units, from m/s
-
+%check number of inputs/outputs
 if ((nargin~=2) | (nargout~=1)),
 	help loadresultsfromdisk;
@@ -12,11 +11,14 @@
 end
 
-
-md.results=parseresultsfromdisk(filename);
+%load result onto model
+if isnan(md.results)
+	md.results=struct();
+end
+eval(['md.results.' md.analysis_type '=parseresultsfromdisk(filename);']);
 
 %Check result is consistent
 disp(sprintf('%s\n','checking result consistency'));
-
 if ~isresultconsistent(md),
-	disp('!! results not consistent correct the model !!') %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 put an error, it would kill the computed results (even if not consistent...)
+	disp('!! results not consistent correct the model !!') 
 end
Index: /issm/trunk/src/m/classes/public/parseresultsfromdisk.m
===================================================================
--- /issm/trunk/src/m/classes/public/parseresultsfromdisk.m	(revision 671)
+++ /issm/trunk/src/m/classes/public/parseresultsfromdisk.m	(revision 672)
@@ -14,13 +14,11 @@
 
 %Read fields until the end of the file.
-while 0<1,
+result=ReadData(fid);
+while ~isempty(result),
 
+	eval(['results(' num2str(result.step) ').' result.fieldname '=result.field;']);
+	eval(['results(' num2str(result.step) ').time=result.time;']);
+	eval(['results(' num2str(result.step) ').step=result.step;']);
 	result=ReadData(fid);
-	if isempty(result),
-		break;
-	else
-		eval(['results(' num2str(result.step) ').' result.fieldname '=result.field;']);
-		eval(['results(' num2str(result.step) ').time=result.time;']);
-		eval(['results(' num2str(result.step) ').step=result.step;']);
-	end
+
 end
Index: /issm/trunk/src/m/classes/public/solveparallel.m
===================================================================
--- /issm/trunk/src/m/classes/public/solveparallel.m	(revision 671)
+++ /issm/trunk/src/m/classes/public/solveparallel.m	(revision 672)
@@ -26,5 +26,3 @@
 	%load results
 	md=loadresultsfromcluster(md);
-else
-	return;
 end