Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.par
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.par	(revision 12852)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.par	(revision 12853)
@@ -49,6 +49,6 @@
 %Deal with boundary conditions:
 md=SetIceShelfBC(md);
 
-%Change name so that no test have the same name
+%Change name so that no tests have the same name
 A=dbstack;
 if (length(A)>2), md.miscellaneous.name=A(3).file(1:end-2); end
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.py
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.py	(revision 12852)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/Par/SquareShelfConstrained.py	(revision 12853)
@@ -3,6 +3,8 @@
 import scipy.io as matio
 import InterpFromMeshToMesh2d as im
 from   paterson import  *
+from SetIceShelfBC import *
+import inspect
 
 #Start defining model parameters here
 #Geometry
@@ -18,8 +20,8 @@
 #Initial velocity 
 mat=matio.loadmat('../Data/SquareShelfConstrained.data')
 #Reshape as Rank-1 arrays
-x=reshape(mat['x'],(size(mat['x']),))
-y=reshape(mat['y'],(size(mat['y']),))
+x=reshape(mat['x'],(-1))
+y=reshape(mat['y'],(-1))
 vx=mat['vx']
 vy=mat['vy']
 #deal with 'F' oriented matlab matrices!
@@ -57,8 +59,7 @@
 md.timestepping.final_time = 3.
 #Deal with boundary conditions:
 md = SetIceShelfBC(md)
-#Change name so that no test have the same name
-A = dbstack
-if length(A) > 2.:
-    md.miscellaneous.name = A[2].file[0:0-2.]
+#Change name so that no tests have the same name
+if len(inspect.stack()) > 2:
+    md.miscellaneous.name = inspect.stack()[2][1].split('.')[0]
 
Index: /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/runme.py
===================================================================
--- /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/runme.py	(revision 12852)
+++ /u/astrid-r1b/morlighe/issmuci/trunk-jpl/../trunk-jpl/test/NightlyRun/runme.py	(revision 12853)
@@ -7,9 +7,6 @@
 import netCDF4
 import sys
 
-from parallelrange import parallelrange
-from IdToName import IdToName
-
 def runme(id=None,exclude=None,benchmark='nightly',procedure='check',output='none',rank=1,numprocs=1):
 	"""
 	RUNME - test deck for ISSM nightly runs
@@ -42,6 +39,9 @@
 	       md=runme(id=102,procedure='update')
 	"""
 
+	from parallelrange import parallelrange
+	from IdToName import IdToName
+
 	#Get ISSM_DIR variable
 	ISSM_DIR=os.environ['ISSM_DIR']
 	print 'ISSM_DIR =',ISSM_DIR