From 5c92543036202d86fb3d26d676100295c7ac1509 Mon Sep 17 00:00:00 2001
From: Marco Ratto <marco.ratto@jrc.ec.europa.eu>
Date: Fri, 8 Oct 2010 17:54:31 +0200
Subject: [PATCH] When remotes crash, loop for all slaves before stopping

---
 matlab/masterParallel.m | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/matlab/masterParallel.m b/matlab/masterParallel.m
index 1a45bb638..92184d380 100644
--- a/matlab/masterParallel.m
+++ b/matlab/masterParallel.m
@@ -502,6 +502,7 @@ dynareParallelGetFiles([fname,'_output_*.mat'],PRCDir,Parallel(1:totSlaves));
 
 
 % Create return value.
+iscrash = 0;
 for j=1:totCPU,
     load([fname,'_output_',int2str(j),'.mat'],'fOutputVar');
     delete([fname,'_output_',int2str(j),'.mat']);
@@ -510,11 +511,17 @@ for j=1:totCPU,
     end
     if isfield(fOutputVar,'error'),
         disp(['Job number ',int2str(j),'crashed with error:']);
-        error([fOutputVar.error.message]);
+        iscrash=1;
+        keyboard;
+        disp([fOutputVar.error.message]);
+    else
+        fOutVar(j)=fOutputVar;
     end
-    fOutVar(j)=fOutputVar;
 end
-
+if iscrash,
+   error('Remote jobs crashed');
+end
+            
 pause(1), % wait for all remote diary off completed
 
 % Cleanup. (Only if the computing is executed remotly).