Changeset 22665

Timestamp:

04/03/18 14:15:03 (7 years ago)

Author:

seroussi

Message:

FIX: fixed solveiceocean

File:

• issm/trunk-jpl/src/m/solve/solveiceocean.m (modified) (2 diffs)

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

@@ -42 +42 @@
 cluster=md.cluster;
 if strcmpi(getfieldvalue(options,'batch','no'),'yes') batch=1; else batch=0; end
-if ~isclass(cluster,'localpfe'),
+if ~isa(cluster,'localpfe') & ~isa(cluster,'generic'),
         error('cannot run ice/ocean simulation on any other cluster than localpfe');
 end
@@ -131 +131 @@
                 disp('loading results from cluster');
         end
-        md=loadresultsfromcluster(md);
+        md=loadresultsfromcluster(md,'');
 elseif md.settings.waitonlock==0,
          disp('Model results must be loaded manually with md=loadresultsfromcluster(md);');