Index: /issm/trunk-jpl/src/m/solve/solveiceocean.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/solveiceocean.m	(revision 22664)
+++ /issm/trunk-jpl/src/m/solve/solveiceocean.m	(revision 22665)
@@ -42,5 +42,5 @@
 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,5 +131,5 @@
 		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);');