Changeset 18368

Timestamp:

08/12/14 16:12:40 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed some stuff

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic_static.m (modified) (2 diffs)
• solve/waitonlock.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/clusters/generic_static.m

@@ -2 +2 @@
 %
 %   Usage:
-%      cluster=generic_static.m('name','astrid','np',3);
+%      cluster=generic_static('name','astrid','np',3);
 
-classdef generic_static.m
+classdef generic_static
         properties (SetAccess=public) 
                 % {{{
@@ -10 +10 @@
                 np=1;
                 codepath=fileparts(which('issm.exe'));
+                executionpath = '.';
+                interactive = 1;
                 shell='/bin/sh';
                 %}}}
         end
         methods
-                function cluster=generic_static.m(varargin) % {{{
+                function cluster=generic_static(varargin) % {{{
 
                         %use provided options to change fields

issm/trunk-jpl/src/m/solve/waitonlock.m

@@ -27 +27 @@
 
 %If we are using the generic cluster in interactive mode, job is already complete
-if isa(cluster,'generic') & cluster.interactive
+if (isa(cluster,'generic') & cluster.interactive) | isa(cluster,'generic_static'),
         %We are in interactive mode, no need to check for job completion
         ispresent=1;