Capture separately the error when the master asked to break the job.

matlab/parallel/fParallel.m

@@ -84,10 +84,16 @@ try,
     
     disp(['fParallel ',int2str(whoiam),' completed.'])
 catch,
+    theerror = lasterror;
+    if strfind(theerror.message,'Master asked to break the job')
+        fOutputVar.message = theerror;
+        save([ fname,'_output_',int2str(whoiam),'.mat'],'fOutputVar' )
+        waitbarString = theerror.message;
+    else
         disp(['fParallel ',int2str(whoiam),' crashed.'])
-    fOutputVar.error = lasterror;
+        fOutputVar.error = theerror;
         save([ fname,'_output_',int2str(whoiam),'.mat'],'fOutputVar' )
-    waitbarString = fOutputVar.error.message;
+        waitbarString = theerror.message;
         %       waitbarTitle=['Metropolis-Hastings ',options_.parallel(ThisMatlab).ComputerName];
         if Parallel(ThisMatlab).Local,
             waitbarTitle='Local ';
@@ -95,6 +101,7 @@ catch,
             waitbarTitle=[Parallel(ThisMatlab).ComputerName];
         end
         fMessageStatus(NaN,whoiam,waitbarString, waitbarTitle, Parallel(ThisMatlab));
+    end
     
 end
 diary off;

matlab/parallel/slaveParallel.m

@@ -143,9 +143,16 @@ while (etime(clock,t0)<1200 && ~isempty(fslave)) || ~isempty(dir(['stayalive',in
 
             disp(['Job ',fname,' on CPU ',int2str(whoiam),' completed.']);
             t0 =clock; % Re-set waiting time of 20 mins
-        catch ME
+        catch,
+            theerror = lasterror;
+            if strfind(theerror.message,'Master asked to break the job')
+                disp(['Job ',fname,' on CPU ',int2str(whoiam),' broken from master.']);
+                fOutputVar.message = theerror;
+                save([ fname,'_output_',int2str(whoiam),'.mat'],'fOutputVar' )
+                delete(['P_',fname,'_',int2str(whoiam),'End.txt']);
+            else
                 disp(['Job ',fname,' on CPU ',int2str(whoiam),' crashed.']);
-            fOutputVar.error = ME;
+                fOutputVar.error = theerror;
                 save([ fname,'_output_',int2str(whoiam),'.mat'],'fOutputVar' );
                 waitbarString = fOutputVar.error.message;
                 if Parallel(ThisMatlab).Local,
@@ -156,6 +163,7 @@ while (etime(clock,t0)<1200 && ~isempty(fslave)) || ~isempty(dir(['stayalive',in
                 fMessageStatus(NaN,whoiam,waitbarString, waitbarTitle, Parallel(ThisMatlab));
                 delete(['P_',fname,'_',int2str(whoiam),'End.txt']);
                 break
+            end
             
         end
     end