Index: /issm/trunk-jpl/test/Par/79North.par
===================================================================
--- /issm/trunk-jpl/test/Par/79North.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/79North.par	(revision 24863)
@@ -30,5 +30,5 @@
 %Friction
 md.friction.coefficient=50.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
@@ -36,5 +36,5 @@
 %Ice shelf melting and surface mass balance 
 md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
-md.basalforcings.floatingice_melting_rate(find(md.mask.groundedice_levelset<0.))=0.;
+md.basalforcings.floatingice_melting_rate(find(md.mask.ocean_levelset<0.))=0.;
 md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
 md.smb.mass_balance=15.*ones(md.mesh.numberofvertices,1);
Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.par
===================================================================
--- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksAB.par	(revision 24863)
@@ -52,5 +52,5 @@
 %Friction
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.par
===================================================================
--- /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/GiaIvinsBenchmarksCD.par	(revision 24863)
@@ -51,5 +51,5 @@
 %Friction
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/ISMIPA.par
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPA.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/ISMIPA.par	(revision 24863)
@@ -8,5 +8,5 @@
 disp('      creating drag');
 md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/ISMIPB.par
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPB.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/ISMIPB.par	(revision 24863)
@@ -8,5 +8,5 @@
 disp('      creating drag');
 md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/ISMIPC.par
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPC.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/ISMIPC.par	(revision 24863)
@@ -9,5 +9,5 @@
 %md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x/2.)).*sin(md.mesh.y*2.*pi/max(md.mesh.x/2.)))./(md.constants.g*(md.materials.rho_ice*md.geometry.thickness+md.materials.rho_water*md.geometry.base)));
 md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x)).*sin(md.mesh.y*2.*pi/max(md.mesh.x))));
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=zeros(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/ISMIPD.par
===================================================================
--- /issm/trunk-jpl/test/Par/ISMIPD.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/ISMIPD.par	(revision 24863)
@@ -8,5 +8,5 @@
 disp('      creating drag');
 md.friction.coefficient=sqrt(md.constants.yts.*(1000.+1000.*sin(md.mesh.x*2.*pi/max(md.mesh.x))));
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=zeros(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/IceCube.par
===================================================================
--- /issm/trunk-jpl/test/Par/IceCube.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/IceCube.par	(revision 24863)
@@ -22,5 +22,5 @@
 %Friction
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/Pig.par
===================================================================
--- /issm/trunk-jpl/test/Par/Pig.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/Pig.par	(revision 24863)
@@ -26,5 +26,5 @@
 md.geometry.base=md.geometry.surface-md.geometry.thickness;
 md.geometry.bed =md.geometry.base;
-pos = find(md.mask.groundedice_levelset<0);
+pos = find(md.mask.ocean_levelset<0);
 md.geometry.bed(pos) =InterpFromMeshToMesh2d(index,x,y,bed,md.mesh.x(pos),md.mesh.y(pos));
 clear surface thickness vx_obs vy_obs x y index;
@@ -42,5 +42,5 @@
 %Friction
 md.friction.coefficient=50*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/RoundSheetShelf.par
===================================================================
--- /issm/trunk-jpl/test/Par/RoundSheetShelf.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/RoundSheetShelf.par	(revision 24863)
@@ -13,5 +13,5 @@
 md.geometry.base=-md.materials.rho_ice/md.materials.rho_water*md.geometry.thickness;
 
-pos=find(md.mask.groundedice_levelset>0.);
+pos=find(md.mask.ocean_levelset>0.);
 md.geometry.base(pos)=md.geometry.base(pos)-300.*(radius(pos)-(rad-shelfextent))/(rad-shelfextent);
 md.geometry.surface=md.geometry.base+md.geometry.thickness;
@@ -64,5 +64,5 @@
 md.smb.mass_balance=-10.*ones(md.mesh.numberofvertices,1);
 md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
-pos=find(md.mask.groundedice_levelset>0.);md.basalforcings.groundedice_melting_rate(pos)=10.;
+pos=find(md.mask.ocean_levelset>0.);md.basalforcings.groundedice_melting_rate(pos)=10.;
 md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
 md.basalforcings.geothermalflux=ones(md.mesh.numberofvertices,1);
@@ -96,5 +96,5 @@
 md.groundingline.migration='AggressiveMigration';
 md.geometry.bed=md.geometry.base;
-pos=find(md.mask.groundedice_levelset<0.); md.geometry.bed(pos)=md.geometry.base(pos)-900.;
+pos=find(md.mask.ocean_levelset<0.); md.geometry.bed(pos)=md.geometry.base(pos)-900.;
 
 %Deal with boundary conditions:
Index: /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par
===================================================================
--- /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/RoundSheetStaticEISMINT.par	(revision 24863)
@@ -11,5 +11,5 @@
 disp('      creating drag');
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareEISMINT.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareEISMINT.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareEISMINT.par	(revision 24863)
@@ -10,5 +10,5 @@
 disp('      creating drag');
 md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareNoDyn.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareNoDyn.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareNoDyn.par	(revision 24863)
@@ -13,5 +13,5 @@
 %Friction
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareSheetConstrained.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetConstrained.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareSheetConstrained.par	(revision 24863)
@@ -42,5 +42,5 @@
 %Friction
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareSheetConstrainedCO2.par	(revision 24863)
@@ -53,5 +53,5 @@
 %Friction
 md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareSheetShelf.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareSheetShelf.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareSheetShelf.par	(revision 24863)
@@ -44,5 +44,5 @@
 %Friction
 md.friction.coefficient=20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareShelf.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareShelf.par	(revision 24863)
@@ -37,5 +37,5 @@
 %Friction
 md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareShelf2.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelf2.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareShelf2.par	(revision 24863)
@@ -36,5 +36,5 @@
 %Friction
 md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareShelfConstrained.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareShelfConstrained.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareShelfConstrained.par	(revision 24863)
@@ -42,5 +42,5 @@
 %Friction
 md.friction.coefficient=20*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/Par/SquareThermal.par
===================================================================
--- /issm/trunk-jpl/test/Par/SquareThermal.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/SquareThermal.par	(revision 24863)
@@ -17,5 +17,5 @@
 disp('      creating drag');
 md.friction.coefficient=200.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.))=0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.))=0.;
 md.friction.p=ones(md.mesh.numberofelements,1);
 md.friction.q=ones(md.mesh.numberofelements,1);
@@ -44,3 +44,3 @@
 md.thermal.spctemperature(:)=md.initialization.temperature;
 md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1); 
-md.basalforcings.geothermalflux(find(md.mask.groundedice_levelset>0.))=1.*10^-3; %1 mW/m^2
+md.basalforcings.geothermalflux(find(md.mask.ocean_levelset>0.))=1.*10^-3; %1 mW/m^2
Index: /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par
===================================================================
--- /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par	(revision 24862)
+++ /issm/trunk-jpl/test/Par/ValleyGlacierShelf.par	(revision 24863)
@@ -26,5 +26,5 @@
 %Mask
 md.mask.ice_levelset = x - alpha*Lx;
-md.mask.groundedice_levelset = ones(md.mesh.numberofvertices,1);
+md.mask.ocean_levelset = ones(md.mesh.numberofvertices,1);
 
 %Initial velocity 
@@ -55,5 +55,5 @@
 %Friction
 md.friction.coefficient = 20.*ones(md.mesh.numberofvertices,1);
-md.friction.coefficient(find(md.mask.groundedice_levelset<0.)) = 0.;
+md.friction.coefficient(find(md.mask.ocean_levelset<0.)) = 0.;
 md.friction.p = ones(md.mesh.numberofelements,1);
 md.friction.q = ones(md.mesh.numberofelements,1);
Index: /issm/trunk-jpl/test/SandBox/test2004.m
===================================================================
--- /issm/trunk-jpl/test/SandBox/test2004.m	(revision 24862)
+++ /issm/trunk-jpl/test/SandBox/test2004.m	(revision 24863)
@@ -124,12 +124,12 @@
 	if bas.isnameany('antarctica-grounded'), 
 
-		md.mask.groundedice_levelset=ones(md.mesh.numberofvertices,1);
+		md.mask.ocean_levelset=ones(md.mesh.numberofvertices,1);
 	end
 	if bas.isnameany('ronne'), 
 
-		md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1);
+		md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1);
 
 		%correction to land and ocean levelset: ice shelf is not on land! 
-		pos=find(md.mask.ice_levelset<=0 & md.mask.groundedice_levelset<=0);
+		pos=find(md.mask.ice_levelset<=0 & md.mask.ocean_levelset<=0);
 		md.mask.ocean_levelset(pos)=1;
 		md.mask.land_levelset(pos)=-1;
@@ -255,5 +255,5 @@
 
 	%grounded ice: 
-	md.mask.groundedice_levelset=-ones(md.mesh.numberofvertices,1); 
+	md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); 
 
 	md.mask.glacier_levelset=zeros(md.mesh.numberofvertices,1);
@@ -324,5 +324,4 @@
 
 %transfer a list of fields from each icecap and continent back to Earth: 
-sl.transfer('mask.groundedice_levelset');
 sl.transfer('mask.ice_levelset');
 sl.transfer('mask.ocean_levelset');