Changeset 2689

Timestamp:

12/01/09 08:02:11 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor bug fix

Location:

issm/trunk/src/m/classes/public

Files:

• collapse.m (modified) (1 diff)
• solveparallel.m (modified) (1 diff)

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

@@ -51 +51 @@
 if ~isnan(md.elements_type2d)
         md.elements_type=md.elements_type2d; 
-else
-        md.elements_type2d(:,1)=project2d(md,md.elements_type(:,1),1);
-        md.elements_type2d(:,2)=project2d(md,md.elements_type(:,2),1);
+elseif ~isnan(md.elements_type)
+        md.elements_type=project2d(md,md.elements_type,1);
 end     
 md.gridonhutter=project2d(md,md.gridonhutter,1);

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

@@ -26 +26 @@
 
 %Do we return, or just wait for results?
-if md.waitonlock~=0,
+if md.waitonlock~=0 &  ~strcmpi(options.batch,'yes'),
         %we wait for the done file
         islock=waitonlock(md,executionpath);