Index: /issm/trunk-jpl/test/NightlyRun/test806.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test806.m	(revision 20467)
+++ /issm/trunk-jpl/test/NightlyRun/test806.m	(revision 20468)
@@ -28,5 +28,5 @@
 md.calving.coeff=4.89e13*ones(md.mesh.numberofvertices,1);
 md.calving.meltingrate=zeros(md.mesh.numberofvertices,1);
-md.calving.spclevelset=NaN(md.mesh.numberofvertices,1);
+md.levelset.spclevelset=NaN(md.mesh.numberofvertices,1);
 
 md.transient.requested_outputs={'default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate'};
Index: /issm/trunk-jpl/test/NightlyRun/test806.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test806.py	(revision 20467)
+++ /issm/trunk-jpl/test/NightlyRun/test806.py	(revision 20468)
@@ -39,5 +39,5 @@
 md.calving.coeff=4.89e13*numpy.ones((md.mesh.numberofvertices,1))
 md.calving.meltingrate=numpy.zeros((md.mesh.numberofvertices,1))
-md.calving.spclevelset=numpy.float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.levelset.spclevelset=numpy.float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
 
 md.transient.requested_outputs=['default','StrainRateparallel','StrainRateperpendicular','Calvingratex','Calvingratey','CalvingCalvingrate']
Index: /issm/trunk-jpl/test/NightlyRun/test807.m
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test807.m	(revision 20467)
+++ /issm/trunk-jpl/test/NightlyRun/test807.m	(revision 20468)
@@ -27,5 +27,5 @@
 md.calving.calvingrate=zeros(md.mesh.numberofvertices,1);
 md.calving.meltingrate=10000*ones(md.mesh.numberofvertices,1);
-md.calving.spclevelset=NaN(md.mesh.numberofvertices,1);
+md.levelset.spclevelset=NaN(md.mesh.numberofvertices,1);
 
 md=solve(md,TransientSolutionEnum());
Index: /issm/trunk-jpl/test/NightlyRun/test807.py
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test807.py	(revision 20467)
+++ /issm/trunk-jpl/test/NightlyRun/test807.py	(revision 20468)
@@ -38,5 +38,5 @@
 md.calving.calvingrate=numpy.zeros((md.mesh.numberofvertices,1))
 md.calving.meltingrate=10000*numpy.ones((md.mesh.numberofvertices,1))
-md.calving.spclevelset=numpy.float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.levelset.spclevelset=numpy.float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
 
 md=solve(md,TransientSolutionEnum())
Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetConstrained.par	(revision 20467)
+++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.par	(revision 20468)
@@ -32,5 +32,5 @@
 %Calving
 md.calving.calvingrate=zeros(md.mesh.numberofvertices,1);
-md.calving.spclevelset=NaN(md.mesh.numberofvertices,1);
+md.levelset.spclevelset=NaN(md.mesh.numberofvertices,1);
 
 %Friction
Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.py
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetConstrained.py	(revision 20467)
+++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.py	(revision 20468)
@@ -42,5 +42,5 @@
 #Calving
 md.calving.calvingrate=0.*numpy.ones((md.mesh.numberofvertices,1))
-md.calving.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.levelset.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
 
 #Friction
Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par
===================================================================
--- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par	(revision 20467)
+++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par	(revision 20468)
@@ -77,5 +77,5 @@
 md.calving.calvingrate = 0.*ones(md.mesh.numberofvertices,1);
 md.calving.meltingrate = 0.*ones(md.mesh.numberofvertices,1);
-md.calving.spclevelset=NaN(md.mesh.numberofvertices,1);
+md.levelset.spclevelset=NaN(md.mesh.numberofvertices,1);
 md.masstransport.stabilization = 1.;
 
Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py
===================================================================
--- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py	(revision 20467)
+++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.py	(revision 20468)
@@ -84,5 +84,5 @@
 md.calving.calvingrate=0.*numpy.ones((md.mesh.numberofvertices,1))
 md.calving.meltingrate=0.*numpy.ones((md.mesh.numberofvertices,1))
-md.calving.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.levelset.spclevelset=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
 md.masstransport.stabilization=1.