Index: /issm/trunk/test/Miscellaneous/Bump/runme.m
===================================================================
--- /issm/trunk/test/Miscellaneous/Bump/runme.m	(revision 8307)
+++ /issm/trunk/test/Miscellaneous/Bump/runme.m	(revision 8308)
@@ -5,5 +5,5 @@
 md.cluster=astrid;
 md.cluster.np=13;
-md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum);
 
 %Fields and tolerances to track changes
Index: /issm/trunk/test/Miscellaneous/GJM_test1/test1.m
===================================================================
--- /issm/trunk/test/Miscellaneous/GJM_test1/test1.m	(revision 8307)
+++ /issm/trunk/test/Miscellaneous/GJM_test1/test1.m	(revision 8308)
@@ -4,3 +4,3 @@
 md=setelementstype(md,'macayeal','all');
 md.cluster=none;
-md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+md=solve(md,DiagnosticSolutionEnum);
Index: /issm/trunk/test/Miscellaneous/Regularization/runme.m
===================================================================
--- /issm/trunk/test/Miscellaneous/Regularization/runme.m	(revision 8307)
+++ /issm/trunk/test/Miscellaneous/Regularization/runme.m	(revision 8308)
@@ -15,5 +15,5 @@
 
 	md.cluster=eval(oshostname);
-	md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+	md=solve(md,DiagnosticSolutionEnum);
 	md.vx_obs=PatchToVec(md.results.DiagnosticSolution.Vx);
 	md.vy_obs=PatchToVec(md.results.DiagnosticSolution.Vy);
@@ -32,5 +32,5 @@
 	md.weights=1*ones(md.numberofnodes,1);
 	md.eps_cm=NaN;
-	md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+	md=solve(md,DiagnosticSolutionEnum);
 	md.results.DiagnosticSolution_NO=md.results.DiagnosticSolution;
 end
@@ -47,5 +47,5 @@
 	md.weights=1*ones(md.numberofnodes,1);
 	md.eps_cm=NaN;
-	md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+	md=solve(md,DiagnosticSolutionEnum);
 	md.results.DiagnosticSolution_YES1=md.results.DiagnosticSolution;
 end
@@ -62,5 +62,5 @@
 	md.weights=1*ones(md.numberofnodes,1);
 	md.eps_cm=NaN;
-	md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+	md=solve(md,DiagnosticSolutionEnum);
 	md.results.DiagnosticSolution_YES2=md.results.DiagnosticSolution;
 end
@@ -77,5 +77,5 @@
 	md.weights=1*ones(md.numberofnodes,1);
 	md.eps_cm=NaN;
-	md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+	md=solve(md,DiagnosticSolutionEnum);
 	md.results.DiagnosticSolution_YES3=md.results.DiagnosticSolution;
 end
Index: /issm/trunk/test/Miscellaneous/connectivity/runme.m
===================================================================
--- /issm/trunk/test/Miscellaneous/connectivity/runme.m	(revision 8307)
+++ /issm/trunk/test/Miscellaneous/connectivity/runme.m	(revision 8308)
@@ -49,7 +49,7 @@
 		if isparallel
 			md.cluster='wilkes';
-			md=solve(md,'analysis_type','diagnostic_horiz');
+			md=solve(md,'diagnostic_horiz');
 		else
-			md=solve(md,'analysis_type','diagnostic');
+			md=solve(md,'diagnostic');
 		end
 		t2=clock;
Index: /issm/trunk/test/Par/79North.par
===================================================================
--- /issm/trunk/test/Par/79North.par	(revision 8307)
+++ /issm/trunk/test/Par/79North.par	(revision 8308)
@@ -43,5 +43,5 @@
 %Boundary conditions:
 md=SetMarineIceSheetBC(md);
-pos=find(md.gridonboundary);
+pos=find(md.nodeonboundary);
 md.spcthickness(pos,1)=1;
 md.spcthickness(pos,2)=md.thickness(pos);
Index: /issm/trunk/test/Par/ISMIPA.par
===================================================================
--- /issm/trunk/test/Par/ISMIPA.par	(revision 8307)
+++ /issm/trunk/test/Par/ISMIPA.par	(revision 8308)
@@ -21,5 +21,5 @@
 
 disp('      boundary conditions for diagnostic model');
-%Create grid on boundary fist (because we cannot use mesh)
+%Create node on boundary fist (because we cannot use mesh)
 md=SetIceSheetBC(md);
 
Index: /issm/trunk/test/Par/ISMIPB.par
===================================================================
--- /issm/trunk/test/Par/ISMIPB.par	(revision 8307)
+++ /issm/trunk/test/Par/ISMIPB.par	(revision 8308)
@@ -21,5 +21,5 @@
 
 disp('      boundary conditions for diagnostic model');
-%Create grid on boundary fist (because we cannot use mesh)
+%Create node on boundary fist (because we cannot use mesh)
 md=SetIceSheetBC(md);
 md=SetParallel(md,8);
Index: /issm/trunk/test/Par/ISMIPC.par
===================================================================
--- /issm/trunk/test/Par/ISMIPC.par	(revision 8307)
+++ /issm/trunk/test/Par/ISMIPC.par	(revision 8308)
@@ -22,5 +22,5 @@
 
 disp('      boundary conditions for diagnostic model: ');
-%Create grid on boundary fist (because wi can not use mesh)
+%Create node on boundary fist (because wi can not use mesh)
 md=SetIceSheetBC(md);
 md=SetParallel(md,8);
Index: /issm/trunk/test/Par/ISMIPD.par
===================================================================
--- /issm/trunk/test/Par/ISMIPD.par	(revision 8307)
+++ /issm/trunk/test/Par/ISMIPD.par	(revision 8308)
@@ -21,5 +21,5 @@
 
 disp('      boundary conditions for diagnostic model: ');
-%Create grid on boundary fist (because wi can not use mesh)
+%Create node on boundary fist (because wi can not use mesh)
 md=SetIceSheetBC(md);
 
Index: /issm/trunk/test/Par/ISMIPE.par
===================================================================
--- /issm/trunk/test/Par/ISMIPE.par	(revision 8307)
+++ /issm/trunk/test/Par/ISMIPE.par	(revision 8308)
@@ -30,5 +30,5 @@
 
 disp('      boundary conditions for diagnostic model: ');
-%Create grid on boundary fist (because wi can not use mesh)
+%Create node on boundary fist (because wi can not use mesh)
 md=SetIceSheetBC(md);
 
Index: /issm/trunk/test/Par/ISMIPF.par
===================================================================
--- /issm/trunk/test/Par/ISMIPF.par	(revision 8307)
+++ /issm/trunk/test/Par/ISMIPF.par	(revision 8308)
@@ -21,5 +21,5 @@
 
 disp('      boundary conditions for diagnostic model');
-%Create grid on boundary fist (because we cannot use mesh)
+%Create node on boundary fist (because we cannot use mesh)
 md=SetIceSheetBC(md);
 md.spcvelocity(:,4)=100*ones(md.numberofnodes,1);
Index: /issm/trunk/test/Par/RoundSheetShelf.par
===================================================================
--- /issm/trunk/test/Par/RoundSheetShelf.par	(revision 8307)
+++ /issm/trunk/test/Par/RoundSheetShelf.par	(revision 8308)
@@ -13,5 +13,5 @@
 md.bed=-md.rho_ice/md.rho_water*md.thickness;
 
-pos=find(md.gridonicesheet);
+pos=find(md.nodeonicesheet);
 md.bed(pos)=md.bed(pos)-300*(radius(pos)-(rad-shelfextent))/(rad-shelfextent);
 md.surface=md.bed+md.thickness;
@@ -48,5 +48,5 @@
 md.accumulation_rate=-10*ones(md.numberofnodes,1);
 md.melting_rate=zeros(md.numberofnodes,1);
-pos=find(md.gridoniceshelf);md.melting_rate(pos)=10;
+pos=find(md.nodeoniceshelf);md.melting_rate(pos)=10;
 
 %Friction
@@ -72,5 +72,5 @@
 md.gl_migration=AgressiveMigrationEnum;
 md.bathymetry=md.bed;
-pos=find(md.gridoniceshelf); md.bathymetry(pos)=md.bed(pos)-900;
+pos=find(md.nodeoniceshelf); md.bathymetry(pos)=md.bed(pos)-900;
 
 %Deal with boundary conditions: