Index: /issm/trunk-jpl/src/m/solve/waitonlock.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/waitonlock.m	(revision 17048)
+++ /issm/trunk-jpl/src/m/solve/waitonlock.m	(revision 17049)
@@ -16,6 +16,13 @@
 timelimit     = md.settings.waitonlock;
 cluster       = md.cluster;
-lockfilename  = [executionpath '/' md.private.runtimename '/' md.miscellaneous.name '.lock'];
-logfilename   = [executionpath '/' md.private.runtimename '/' md.miscellaneous.name '.outlog'];
+
+if ~isa(cluster,'generic') & cluster.interactive,
+	lockfilename  = [executionpath '/Interactive' num2str(cluster.interactive) '/' md.miscellaneous.name '.lock'];
+	logfilename   = [executionpath '/Interactive' num2str(cluster.interactive) '/' md.miscellaneous.name '.outlog'];
+else
+	lockfilename  = [executionpath '/' md.private.runtimename '/' md.miscellaneous.name '.lock'];
+	logfilename   = [executionpath '/' md.private.runtimename '/' md.miscellaneous.name '.outlog'];
+end
+
 
 %If we are using the generic cluster in interactive mode, job is already complete