Index: /issm/trunk-jpl/test/NightlyRun/test102.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test102.py	(revision 12121)
+++ /issm/trunk-jpl/test/NightlyRun/test102.py	(revision 12122)
@@ -5,5 +5,5 @@
 
 md=model();
-md=triangle(md,'../Exp/Square.exp',150000);
+md=triangle(md,'../Exp/Square.exp',50000);
 md=setmask(md,'all','');
-md=parameterize(md,'../Par/SquareShelfConstrained.par')
+md=parameterize(md,'../Par/SquareShelfConstrained.py')
Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelfConstrained.py	(revision 12122)
+++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.py	(revision 12122)
@@ -0,0 +1,57 @@
+from numpy import *
+import scipy.io as matio
+import InterpFromMeshToMesh2d as im
+
+#Start defining model parameters here
+#Geometry
+hmin = 300.
+hmax = 1000.
+ymin = min(md.mesh.y)
+ymax = max(md.mesh.y)
+
+md.geometry.thickness = hmax+(hmin-hmax)*(md.mesh.y-ymin)/(ymax-ymin)
+md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
+md.geometry.surface = md.geometry.bed+md.geometry.thickness
+
+#%Initial velocity 
+mat=matio.loadmat('../Data/SquareShelfConstrained.data')
+#deal with 'F' oriented matlab matrices!
+index=mat['index'].astype(float)
+index=reshape(index.T,(len(index),3),order='F')
+
+md.initialization.vx = im.InterpFromMeshToMesh2d(index, mat['x'], mat['y'], mat['vx'], md.mesh.x, md.mesh.y)
+md.initialization.vy = im.InterpFromMeshToMesh2d(index, mat['x'], mat['y'], mat['vy'], md.mesh.x, md.mesh.y)
+md.initialization.vz = zeros(md.mesh.numberofvertices)
+md.initialization.pressure = zeros(md.mesh.numberofvertices)
+#%Materials
+md.initialization.temperature = (273.-20)*ones(md.mesh.numberofvertices)
+md.materials.rheology_B = paterson(md.initialization.temperature)
+md.materials.rheology_n = 3.*ones(md.mesh.numberofelements)
+#%Surface mass balance and basal melting
+md.surfaceforcings.mass_balance = 10.*ones(md.mesh.numberofvertices)
+md.basalforcings.melting_rate = 5.*ones(md.mesh.numberofvertices)
+#%Friction
+pos = nonzero(md.mask.elementonfloatingice)
+md.friction.coefficient = 20.*ones(md.mesh.numberofvertices)
+md.friction.coefficient[(md.mesh.elements[int(pos)-1,:])] = 0.
+md.friction.p = ones(md.mesh.numberofelements)
+md.friction.q = ones(md.mesh.numberofelements)
+#%Numerical parameters
+md.diagnostic.viscosity_overshoot = 0.0
+md.prognostic.stabilization = 1.
+md.thermal.stabilization = 1.
+md.verbose = verbose[-1]
+md.settings.waitonlock = 30.
+md.diagnostic.restol = 0.05
+md.diagnostic.reltol = 0.05
+md.steadystate.reltol = 0.05
+md.diagnostic.abstol = nan
+md.timestepping.time_step = 1.
+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.]
+