Index: /issm/trunk-jpl/test/NightlyRun/test332.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test332.m	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test332.m	(revision 21480)
@@ -2,5 +2,5 @@
 md=triangle(model(),'../Exp/Square.exp',100000.);
 md=setmask(md,'','');
-md=parameterize(md,'../Par/SquareSheetConstrained.par');
+md=parameterize(md,'../Par/IceCube.par');
 md.transient=deactivateall(md.transient);
 md.transient.ishydrology=1;
Index: /issm/trunk-jpl/test/NightlyRun/test332.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test332.py	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test332.py	(revision 21480)
@@ -15,5 +15,5 @@
 md=triangle(model(),'../Exp/Square.exp',100000.)
 md=setmask(md,'','')
-md=parameterize(md,'../Par/SquareSheetConstrained.py')
+md=parameterize(md,'../Par/IceCube.py')
 
 md.transient=transient.setallnullparameters(md.transient)
@@ -42,5 +42,5 @@
 #you can also compare with an analitic solution, but it is exact
 #only if no limits are applied
-#analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity))
+#analitic=(md.mesh.y**2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity))
 field_names     =['SedimentWaterHead','SedimentHeadResidual']
 field_tolerances=[1e-13, 3e-10]
Index: /issm/trunk-jpl/test/NightlyRun/test333.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test333.m	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test333.m	(revision 21480)
@@ -2,5 +2,5 @@
 md=triangle(model(),'../Exp/Square.exp',100000.);
 md=setmask(md,'','');
-md=parameterize(md,'../Par/SquareSheetConstrained.par');
+md=parameterize(md,'../Par/IceCube.par');
 md.transient=deactivateall(md.transient);
 md.transient.ishydrology=1;
Index: /issm/trunk-jpl/test/NightlyRun/test333.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test333.py	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test333.py	(revision 21480)
@@ -15,5 +15,7 @@
 md=triangle(model(),'../Exp/Square.exp',100000.)
 md=setmask(md,'','')
-md=parameterize(md,'../Par/SquareSheetConstrained.py')
+md=parameterize(md,'../Par/IceCube.py')
+
+
 md.transient=transient.setallnullparameters(md.transient)
 md.transient.ishydrology=True
Index: /issm/trunk-jpl/test/NightlyRun/test334.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test334.m	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test334.m	(revision 21480)
@@ -4,5 +4,5 @@
 md.transient=deactivateall(md.transient);
 md.transient.ishydrology=1;
-md=parameterize(md,'../Par/SquareSheetConstrained.par');
+md=parameterize(md,'../Par/IceCube.par');
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',1);
Index: /issm/trunk-jpl/test/NightlyRun/test334.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test334.py	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test334.py	(revision 21480)
@@ -15,5 +15,5 @@
 md=triangle(model(),'../Exp/Square.exp',100000.)
 md=setmask(md,'','')
-md=parameterize(md,'../Par/SquareSheetConstrained.py')
+md=parameterize(md,'../Par/IceCube.py')
 md.transient=transient.setallnullparameters(md.transient)
 md.transient.ishydrology=True
Index: /issm/trunk-jpl/test/NightlyRun/test335.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test335.m	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test335.m	(revision 21480)
@@ -5,5 +5,5 @@
 md.transient.ishydrology=1;
 md.transient.issmb=1;
-md=parameterize(md,'../Par/SquareSheetConstrained.par');
+md=parameterize(md,'../Par/IceCube.par');
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',1);
Index: /issm/trunk-jpl/test/NightlyRun/test335.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test335.py	(revision 21479)
+++ /issm/trunk-jpl/test/NightlyRun/test335.py	(revision 21480)
@@ -15,5 +15,5 @@
 md=triangle(model(),'../Exp/Square.exp',100000.)
 md=setmask(md,'','')
-md=parameterize(md,'../Par/SquareSheetConstrained.py')
+md=parameterize(md,'../Par/IceCube.py')
 md.transient=transient.setallnullparameters(md.transient)
 md.transient.ishydrology=True
Index: /issm/trunk-jpl/test/Par/IceCube.par
===================================================================
--- /issm/trunk-jpl/test/Par/IceCube.par	(revision 21480)
+++ /issm/trunk-jpl/test/Par/IceCube.par	(revision 21480)
@@ -0,0 +1,46 @@
+%Start defining model parameters here
+
+%Geometry
+md.geometry.thickness=1000.0*ones(md.mesh.numberofvertices,1);
+md.geometry.base=zeros(md.mesh.numberofvertices,1);
+md.geometry.surface=md.geometry.base+md.geometry.thickness;
+
+md.initialization.vx=zeros(md.mesh.numberofvertices,1);
+md.initialization.vy=zeros(md.mesh.numberofvertices,1);
+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);
+
+%Calving
+md.calving.calvingrate=zeros(md.mesh.numberofvertices,1);
+md.levelset.spclevelset=NaN(md.mesh.numberofvertices,1);
+
+%Friction
+md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
+md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.p=ones(md.mesh.numberofelements,1);
+md.friction.q=ones(md.mesh.numberofelements,1);
+
+%Numerical parameters
+md.stressbalance.viscosity_overshoot=0.0;
+md.masstransport.stabilization=1.;
+md.thermal.stabilization=1.;
+md.verbose=verbose(0);
+md.settings.waitonlock=30;
+md.stressbalance.restol=0.05;
+md.steadystate.reltol=0.05;
+md.stressbalance.reltol=0.05;
+md.stressbalance.abstol=NaN;
+md.timestepping.time_step=1.;
+md.timestepping.final_time=3.;
+
+%Boundary conditions:
+md=SetIceSheetBC(md);
+
+%Change name so that no test have the same name
+A=dbstack;
+if (length(A)>2), md.miscellaneous.name=A(3).file(1:end-2); end
Index: /issm/trunk-jpl/test/Par/IceCube.py
===================================================================
--- /issm/trunk-jpl/test/Par/IceCube.py	(revision 21480)
+++ /issm/trunk-jpl/test/Par/IceCube.py	(revision 21480)
@@ -0,0 +1,55 @@
+import os.path
+import numpy as np
+import inspect
+from verbose import verbose
+from InterpFromMeshToMesh2d import InterpFromMeshToMesh2d
+from paterson import paterson
+from SetIceSheetBC import SetIceSheetBC
+from arch import *
+
+#Start defining model parameters here
+
+#Geometry
+md.geometry.thickness=1000.0*np.ones((md.mesh.numberofvertices))
+md.geometry.base=np.zeros((md.mesh.numberofvertices))
+md.geometry.surface=md.geometry.base+md.geometry.thickness
+
+md.initialization.vx=np.zeros((md.mesh.numberofvertices))
+md.initialization.vy=np.zeros((md.mesh.numberofvertices))
+md.initialization.vz=np.zeros((md.mesh.numberofvertices))
+md.initialization.pressure=np.zeros((md.mesh.numberofvertices))
+
+#Materials
+md.initialization.temperature=(273.-20.)*np.ones((md.mesh.numberofvertices))
+md.materials.rheology_B=paterson(md.initialization.temperature)
+md.materials.rheology_n=3.*np.ones((md.mesh.numberofelements))
+
+#Calving
+md.calving.calvingrate=np.zeros((md.mesh.numberofvertices))
+md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices))
+
+#Friction
+md.friction.coefficient=20.*np.ones((md.mesh.numberofvertices))
+md.friction.coefficient[np.where(md.mask.groundedice_levelset<0.)[0]]=0.
+md.friction.p=np.ones((md.mesh.numberofelements))
+md.friction.q=np.ones((md.mesh.numberofelements))
+
+#Numerical parameters
+md.stressbalance.viscosity_overshoot=0.0
+md.masstransport.stabilization=1.
+md.thermal.stabilization=1.
+md.verbose=verbose(0)
+md.settings.waitonlock=30
+md.stressbalance.restol=0.05
+md.steadystate.reltol=0.05
+md.stressbalance.reltol=0.05
+md.stressbalance.abstol=float('NaN')
+md.timestepping.time_step=1.
+md.timestepping.final_time=3.
+
+#Boundary conditions:
+md=SetIceSheetBC(md)
+
+#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]