Index: /issm/trunk-jpl/src/m/classes/clusters/generic.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/generic.m	(revision 15120)
+++ /issm/trunk-jpl/src/m/classes/clusters/generic.m	(revision 15121)
@@ -114,9 +114,9 @@
 				fid=fopen([modelname '.bat'],'w');
 				fprintf(fid,'@echo off\n');
-				if cluster.interactive
+
+				if cluster.np>1,
+					fprintf(fid,'"C:\\Program Files\\MPICH2\\bin\\mpiexec.exe" -n %i "%s/issm.exe" %s ./ %s ',cluster.np,cluster.codepath,EnumToString(solution),modelname);
+				else
 					fprintf(fid,'"%s/issm.exe" %s ./ %s ',cluster.codepath,EnumToString(solution),modelname);
-				else
-					fprintf(fid,'"%s/issm.exe" %s ./ %s 2> %s.errlog >%s.outlog',...
-						cluster.codepath,EnumToString(solution),modelname,modelname,modelname);
 				end
 				fclose(fid);
Index: /issm/trunk-jpl/src/m/os/oshostname.m
===================================================================
--- /issm/trunk-jpl/src/m/os/oshostname.m	(revision 15120)
+++ /issm/trunk-jpl/src/m/os/oshostname.m	(revision 15121)
@@ -7,5 +7,5 @@
 
 if ispc(),
-	[status,hostname]=system('hostname | sed ''s/-//g''');
+	[status,hostname]=system('hostname');
 	if status, 
 		error('oshostname error message: could not run hostname command on windows os');
Index: /issm/trunk-jpl/src/m/solve/solve.m
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.m	(revision 15120)
+++ /issm/trunk-jpl/src/m/solve/solve.m	(revision 15121)
@@ -82,5 +82,11 @@
 %Launch job
 modelname = md.miscellaneous.name;
-filelist  = {[modelname '.bin '] [modelname '.toolkits '] [modelname '.queue ']};
+filelist  = {[modelname '.bin '] [modelname '.toolkits ']};
+if ispc,
+	filelist{end+1}=[modelname '.bat '];
+else
+	filelist{end+1}=[modelname '.queue '];
+end
+
 if md.qmu.isdakota,
 	filelist{end+1} = [modelname '.qmu.in'];