Changeset 2226 for issm/trunk/src/m/classes/public/solveparallel.m

Timestamp:

09/14/09 08:00:29 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added time limit specified in md.waitonlock [minutes]

File:

• issm/trunk/src/m/classes/public/solveparallel.m (modified) (1 diff)

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

@@ -26 +26 @@
 
 %Do we return, or just wait for results?
-if md.waitonlock,
+if md.waitonlock~=0,
         %we wait for the done file
-        waitonlock([executionpath '/' md.name '.lock']);
-        %load results
-        displaystring(md.debug,'loading results from cluster');
-        md=loadresultsfromcluster(md);
+        islock=waitonlock([executionpath '/' md.name '.lock'],md.waitonlock);
+        if islock==0,
+                %no results to be loaded
+                disp('The results must be loaded manually with loadmodelfromcluster.');
+                error(['solveparallel info message: time limit exceeded'])
+        else
+                %load results
+                displaystring(md.debug,'loading results from cluster');
+                md=loadresultsfromcluster(md);
+        end
 end