Index: /issm/trunk/src/m/clusters/astrid.m
===================================================================
--- /issm/trunk/src/m/clusters/astrid.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/astrid.m	(revision 6040)
@@ -93,8 +93,8 @@
 				
 				disp('uploading input file and queueing script');
-				issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']});
+				issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[md.runtimename '.tar.gz']});
 
 				disp('launching solution sequence on remote cluster');
-				issmssh(md.cluster.name,md.cluster.login,md.cluster.port,launchcommand);
+				issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
 			else
 				disp('batch mode requested: not launching job interactively');
@@ -111,5 +111,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -128,5 +128,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/castor.m
===================================================================
--- /issm/trunk/src/m/clusters/castor.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/castor.m	(revision 6040)
@@ -116,5 +116,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -133,5 +133,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/cosmos.m
===================================================================
--- /issm/trunk/src/m/clusters/cosmos.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/cosmos.m	(revision 6040)
@@ -115,5 +115,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -132,5 +132,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/ericmac.m
===================================================================
--- /issm/trunk/src/m/clusters/ericmac.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/ericmac.m	(revision 6040)
@@ -112,5 +112,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -129,5 +129,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/gemini.m
===================================================================
--- /issm/trunk/src/m/clusters/gemini.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/gemini.m	(revision 6040)
@@ -116,5 +116,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -133,5 +133,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/larsen.m
===================================================================
--- /issm/trunk/src/m/clusters/larsen.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/larsen.m	(revision 6040)
@@ -112,5 +112,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -129,5 +129,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/pfe.m
===================================================================
--- /issm/trunk/src/m/clusters/pfe.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/pfe.m	(revision 6040)
@@ -147,11 +147,11 @@
 				disp('uploading input file and queueing script');
 				if ~cluster.interactive,
-					issmscpout(md.cluster.name,md.cluster.executionpath,md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']});
+					issmscpout(cluster.name,cluster.executionpath,cluster.login,cluster.port,{[md.runtimename '.tar.gz']});
 				else
-					issmscpout(md.cluster.name,[md.cluster.executionpath '/Interactive'],md.cluster.login,md.cluster.port,{[md.runtimename '.tar.gz']});
+					issmscpout(cluster.name,[cluster.executionpath '/Interactive'],cluster.login,cluster.port,{[md.runtimename '.tar.gz']});
 				end
 				
 				disp('launching solution sequence on remote cluster');
-				issmssh(md.cluster.name,md.cluster.login,md.cluster.port,launchcommand);
+				issmssh(cluster.name,cluster.login,cluster.port,launchcommand);
 					
 				if cluster.interactive,
@@ -176,7 +176,7 @@
 			%Figure out the  directory where all the files are in: 
 			if ~cluster.interactive,
-				directory=[executionpath '/' md.runtimename '/'];
-			else
-				directory=[executionpath '/Interactive/'];
+				directory=[cluster.executionpath '/' md.runtimename '/'];
+			else
+				directory=[cluster.executionpath '/Interactive/'];
 			end
 
@@ -196,5 +196,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/pollux.m
===================================================================
--- /issm/trunk/src/m/clusters/pollux.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/pollux.m	(revision 6040)
@@ -116,5 +116,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -133,5 +133,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end
Index: /issm/trunk/src/m/clusters/wilkes.m
===================================================================
--- /issm/trunk/src/m/clusters/wilkes.m	(revision 6039)
+++ /issm/trunk/src/m/clusters/wilkes.m	(revision 6040)
@@ -112,5 +112,5 @@
 
 			%Figure out the  directory where all the files are in: 
-			directory=[executionpath '/' md.runtimename '/'];
+			directory=[cluster.executionpath '/' md.runtimename '/'];
 
 			%What packages are we picking up from remote cluster
@@ -129,5 +129,5 @@
 
 			%copy files from cluster to present directory
-			issmscpin(clustername, login, port, directory, packages);
+			issmscpin(cluster.name, cluster.login, cluster.port, directory, packages);
 		end %}}}
 	end