Index: /issm/trunk-jpl/test/Par/79North.py
===================================================================
--- /issm/trunk-jpl/test/Par/79North.py	(revision 13675)
+++ /issm/trunk-jpl/test/Par/79North.py	(revision 13676)
@@ -11,9 +11,9 @@
 
 #Geometry and observation
-f = netCDF4.Dataset('../Data/79North.nc','r')
+f         = netCDF4.Dataset('../Data/79North.nc','r')
 x         = reshape(f.variables['x'][:],(-1))
 y         = reshape(f.variables['y'][:],(-1))
-vx= f.variables['vx'][:]
-vy= f.variables['vy'][:]
+vx        = f.variables['vx'][:]
+vy        = f.variables['vy'][:]
 index     = f.variables['index'][:]
 surface   = f.variables['surface'][:]
Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetConstrained.py	(revision 13675)
+++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.py	(revision 13676)
@@ -11,6 +11,6 @@
 
 #Geometry
-hmin=300
-hmax=1000
+hmin=300.
+hmax=1000.
 ymin=numpy.min(md.mesh.y)
 ymax=numpy.max(md.mesh.y)
Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetShelf.par	(revision 13675)
+++ /issm/trunk-jpl/test/Par/SquareSheetShelf.par	(revision 13676)
@@ -2,6 +2,6 @@
 
 %Geometry
-hmin=300;
-hmax=1000;
+hmin=300.;
+hmax=1000.;
 ymin=min(md.mesh.y);
 ymax=max(md.mesh.y);
@@ -9,5 +9,5 @@
 md.geometry.bed=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
 bed_sheet=-md.materials.rho_ice/md.materials.rho_water*(hmax+(hmin-hmax)*(ymax/2-ymin)/(ymax-ymin));
-pos=find(md.mesh.y<=ymax/2);
+pos=find(md.mesh.y<=ymax/2.);
 md.geometry.bed(pos)=bed_sheet;
 md.geometry.surface=md.geometry.bed+md.geometry.thickness;
@@ -26,16 +26,16 @@
 
 %Materials
-md.initialization.temperature=(273-20)*ones(md.mesh.numberofvertices,1);
+md.initialization.temperature=(273.-20.)*ones(md.mesh.numberofvertices,1);
 md.materials.rheology_B=paterson(md.initialization.temperature);
-md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
+md.materials.rheology_n=3.*ones(md.mesh.numberofelements,1);
 
 %Accumulation and melting
-md.surfaceforcings.mass_balance=10*ones(md.mesh.numberofvertices,1);
-md.basalforcings.melting_rate=5*ones(md.mesh.numberofvertices,1);
+md.surfaceforcings.mass_balance=10.*ones(md.mesh.numberofvertices,1);
+md.basalforcings.melting_rate=5.*ones(md.mesh.numberofvertices,1);
 
 %Friction
 pos=find(md.mask.elementonfloatingice);
-md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(md.mesh.elements(pos,:))=0;
+md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
+md.friction.coefficient(md.mesh.elements(pos,:))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
@@ -51,6 +51,6 @@
 md.diagnostic.reltol=0.05;
 md.diagnostic.abstol=NaN;
-md.timestepping.time_step=1;
-md.timestepping.final_time=3;
+md.timestepping.time_step=1.;
+md.timestepping.final_time=3.;
 
 %Deal with boundary conditions:
Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetShelf.py	(revision 13676)
+++ /issm/trunk-jpl/test/Par/SquareSheetShelf.py	(revision 13676)
@@ -0,0 +1,72 @@
+import os.path
+import inspect
+import netCDF4
+from numpy import *
+from verbose import *
+from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
+from paterson import *
+from SetMarineIceSheetBC import *
+
+#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
+bed_sheet=-md.materials.rho_ice/md.materials.rho_water*(hmax+(hmin-hmax)*(ymax/2-ymin)/(ymax-ymin))
+pos=numpy.nonzero(md.mesh.y<=ymax/2.)
+md.geometry.bed[pos]=bed_sheet
+md.geometry.surface=md.geometry.bed+md.geometry.thickness
+
+#Initial velocity 
+f = netCDF4.Dataset('../Data/SquareSheetShelf.nc','r')
+x         = reshape(f.variables['x'][:],(-1))
+y         = reshape(f.variables['y'][:],(-1))
+vx        = f.variables['vx'][:]
+vy        = f.variables['vy'][:]
+index     = f.variables['index'][:]
+f.close()
+
+[md.initialization.vx]  = InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y)
+[md.initialization.vy]  = InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y)
+md.initialization.vz=zeros((md.mesh.numberofvertices,1))
+md.initialization.pressure=zeros((md.mesh.numberofvertices,1))
+
+#Materials
+md.initialization.temperature=(273.-20.)*ones((md.mesh.numberofvertices,1))
+md.materials.rheology_B=paterson(md.initialization.temperature)
+md.materials.rheology_n=3.*ones((md.mesh.numberofelements,1))
+
+#Accumulation and melting
+md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
+
+#Friction
+pos=numpy.nonzero(md.mask.elementonfloatingice)
+md.friction.coefficient=20.*ones((md.mesh.numberofvertices,1))
+md.friction.coefficient[md.mesh.elements[pos].astype(int)-1]=0.
+md.friction.p=ones((md.mesh.numberofelements,1))
+md.friction.q=ones((md.mesh.numberofelements,1))
+
+#Numerical parameters
+md.diagnostic.viscosity_overshoot=0.0
+md.prognostic.stabilization=1
+md.thermal.stabilization=1
+md.verbose=verbose(0)
+md.settings.waitonlock=30.
+md.diagnostic.restol=0.05
+md.steadystate.reltol=0.05
+md.diagnostic.reltol=0.05
+md.diagnostic.abstol=float('NaN')
+md.timestepping.time_step=1.
+md.timestepping.final_time=3.
+
+#Deal with boundary conditions:
+md=SetMarineIceSheetBC(md,'../Exp/SquareFront.exp')
+
+#Change name so that no test have the same name
+if len(inspect.stack()) > 2:
+	md.miscellaneous.name = os.path.basename(inspect.stack()[2][1]).split('.')[0]