Index: /issm/trunk-jpl/src/m/classes/clusters/pfe.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/clusters/pfe.py	(revision 19163)
+++ /issm/trunk-jpl/src/m/classes/clusters/pfe.py	(revision 19164)
@@ -44,6 +44,4 @@
 		self.hyperthreading = 0
 
-		self.np=self.numnodes*self.cpuspernode;
-		
 		#use provided options to change fields
 		options=pairoptions(*args)
@@ -51,5 +49,5 @@
 		#initialize cluster using user settings if provided
 		self=pfe_settings(self)
-
+		self.np=20*8
 		#OK get other fields
 		self=options.AssignObjectFields(self)
@@ -134,4 +132,5 @@
 		# {{{
 
+		self.np=self.numnodes*self.cpuspernode;
 		#write queuing script 
 		fid=open(modelname+'.queue','w')
Index: /issm/trunk-jpl/src/m/solve/solve.py
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.py	(revision 19163)
+++ /issm/trunk-jpl/src/m/solve/solve.py	(revision 19164)
@@ -61,7 +61,10 @@
 
 	#First, build a runtime name that is unique
-	c=datetime.datetime.now()
-	md.private.runtimename="%s-%02i-%02i-%04i-%02i-%02i-%02i-%i" % (md.miscellaneous.name,c.month,c.day,c.year,c.hour,c.minute,c.second,os.getpid())
-
+	if options.getfieldvalue('runtimename',True):
+		c=datetime.datetime.now()
+		md.private.runtimename="%s-%02i-%02i-%04i-%02i-%02i-%02i-%i" % (md.miscellaneous.name,c.month,c.day,c.year,c.hour,c.minute,c.second,os.getpid())
+	else:
+		md.private.runtimename=md.miscellaneous.name
+		
 	#if running qmu analysis, some preprocessing of dakota files using models
 	#fields needs to be carried out.