Index: /issm/trunk/src/m/classes/clusters/astrid.m
===================================================================
--- /issm/trunk/src/m/classes/clusters/astrid.m	(revision 6096)
+++ /issm/trunk/src/m/classes/clusters/astrid.m	(revision 6097)
@@ -13,9 +13,9 @@
 		 np=15;
 		 port=0;
-		 codepath=[issmdir() '/bin'];
-		 executionpath=[issmdir() '/../execution'];
-		 valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind'];
-		 valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
-		 valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp'];
+		 codepath=[issmtier() '/bin'];
+		 executionpath=[issmdir() '/execution'];
+		 valgrind=[issmtier() '/externalpackages/valgrind/install/bin/valgrind'];
+		 valgrindlib=[issmtier() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
+		 valgrindsup=[issmtier() '/externalpackages/valgrind/issm.supp'];
 
 		 %}}}
Index: /issm/trunk/src/m/classes/clusters/larsen.m
===================================================================
--- /issm/trunk/src/m/classes/clusters/larsen.m	(revision 6096)
+++ /issm/trunk/src/m/classes/clusters/larsen.m	(revision 6097)
@@ -13,9 +13,9 @@
 		 np=7;
 		 port=0;
-		 codepath=[issmdir() '/bin'];
-		 executionpath=[issmdir() '/../execution'];
-		 valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind'];
-		 valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
-		 valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp'];
+		 codepath=[issmtier() '/bin'];
+		 executionpath=[issmdir() '/execution'];
+		 valgrind=[issmtier() '/externalpackages/valgrind/install/bin/valgrind'];
+		 valgrindlib=[issmtier() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
+		 valgrindsup=[issmtier() '/externalpackages/valgrind/issm.supp'];
 		 %}}}
 	 end
Index: /issm/trunk/src/m/classes/clusters/wilkes.m
===================================================================
--- /issm/trunk/src/m/classes/clusters/wilkes.m	(revision 6096)
+++ /issm/trunk/src/m/classes/clusters/wilkes.m	(revision 6097)
@@ -13,9 +13,9 @@
 		np=7;
 		port=0;
-		codepath=[issmdir() '/bin'];
-		executionpath=[issmdir() '/../execution'];
-		valgrind=[issmdir() '/externalpackages/valgrind/install/bin/valgrind'];
-		valgrindlib=[issmdir() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
-		valgrindsup=[issmdir() '/externalpackages/valgrind/issm.supp'];
+		codepath=[issmtier() '/bin'];
+		executionpath=[issmdir() '/execution'];
+		valgrind=[issmtier() '/externalpackages/valgrind/install/bin/valgrind'];
+		valgrindlib=[issmtier() '/externalpackages/valgrind/install/lib/libmpidebug.so'];
+		valgrindsup=[issmtier() '/externalpackages/valgrind/issm.supp'];
 	%}}}
     end