Index: /issm/trunk/examples/SquareIceShelf/README
===================================================================
--- /issm/trunk/examples/SquareIceShelf/README	(revision 7025)
+++ /issm/trunk/examples/SquareIceShelf/README	(revision 7026)
@@ -4,4 +4,3 @@
 md=parameterize(md,'Square.par');
 md=setelementstype(md,'macayeal','all');
-md=solve(md,'analysis_type','diagnostic','package','ice');
-plotmodel(md,'data',md.results.diagnostic.vel);
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
Index: /issm/trunk/examples/SquareIceShelf/Square.par
===================================================================
--- /issm/trunk/examples/SquareIceShelf/Square.par	(revision 7025)
+++ /issm/trunk/examples/SquareIceShelf/Square.par	(revision 7026)
@@ -1,8 +1,3 @@
 %Start defining model parameters here
-
-%dynamics
-md.dt=1*md.yts; %1 year
-md.ndt=md.dt*10; 
-md.artificial_diffusivity=1;
 
 disp('      creating thickness');
@@ -17,11 +12,9 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
-%Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
-md.viscosity_overshoot=0.3;
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -29,12 +22,7 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
-%Deal with boundary conditions:
+disp('      creating boundary conditions');
 md=SetIceShelfBC(md,'Front.exp');
-
-%Parallel options
-md.np=3;
-md.time=50;
-md.waitonlock=1;