Index: /issm/trunk-jpl/src/m/classes/clusters/generic.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/generic.py	(revision 17263)
+++ /issm/trunk-jpl/src/m/classes/clusters/generic.py	(revision 17264)
@@ -37,5 +37,5 @@
 
 		#get name
-		self.name=options.getfieldvalue('name',socket.gethostname().lower().split('.')[0])
+		self.name=gethostname()
 
 		#initialize cluster using user settings if provided
@@ -46,5 +46,4 @@
 		self=options.AssignObjectFields(self)
 	# }}}
-
 	def __repr__(self):    # {{{
 		#  display the object
@@ -61,5 +60,4 @@
 		return s
 	# }}}
-
 	def checkconsistency(self,md,solution,analyses):    # {{{
 		if self.np<1:
@@ -70,5 +68,4 @@
 		return md
 	# }}}
-
 	def BuildQueueScript(self,dirname,modelname,solution,io_gather,isvalgrind,isgprof):    # {{{
 
@@ -123,5 +120,4 @@
 			fid.close()
 	# }}}
-
 	def BuildKrigingQueueScript(self,modelname,solution,io_gather,isvalgrind,isgprof):    # {{{
 
@@ -165,5 +161,4 @@
 			fid.close()
 	# }}}
-
 	def LaunchQueueJob(self,modelname,dirname,filelist):    # {{{
 
@@ -184,5 +179,4 @@
 		issmssh(self.name,self.login,self.port,launchcommand)
 	# }}}
-
 	def Download(self,dirname,filelist):     # {{{
 
@@ -195,3 +189,2 @@
 		issmscpin(self.name,self.login,self.port,directory,filelist)
 	# }}}
-
Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py
===================================================================
--- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 17263)
+++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py	(revision 17264)
@@ -335,5 +335,4 @@
 def ExtrudeFromTopAnalysisEnum(): return StringToEnum("ExtrudeFromTopAnalysis")[0]
 def SteadystateSolutionEnum(): return StringToEnum("SteadystateSolution")[0]
-def L2ProjectionTopAnalysisEnum(): return StringToEnum("L2ProjectionTopAnalysis")[0]
 def SurfaceSlopeSolutionEnum(): return StringToEnum("SurfaceSlopeSolution")[0]
 def SmoothedSurfaceSlopeXAnalysisEnum(): return StringToEnum("SmoothedSurfaceSlopeXAnalysis")[0]
Index: /issm/trunk-jpl/src/m/miscellaneous/MatlabFuncs.py
===================================================================
--- /issm/trunk-jpl/src/m/miscellaneous/MatlabFuncs.py	(revision 17263)
+++ /issm/trunk-jpl/src/m/miscellaneous/MatlabFuncs.py	(revision 17264)
@@ -2,5 +2,5 @@
 	import socket
 
-	return socket.gethostname().lower().split('.')[0]
+	return socket.gethostname()
 
 def ispc():
Index: /issm/trunk-jpl/src/m/solve/waitonlock.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/waitonlock.py	(revision 17263)
+++ /issm/trunk-jpl/src/m/solve/waitonlock.py	(revision 17264)
@@ -24,5 +24,5 @@
 
 	#waitonlock will work if the lock is on the same machine only: 
-	if not strcmpi(socket.gethostname().lower().split('.')[0],cluster):
+	if not strcmpi(socket.gethostname(),cluster):
 
 		print 'solution launched on remote cluster. log in to detect job completion.'