Index: /issm/trunk/test/Par/79North.par
===================================================================
--- /issm/trunk/test/Par/79North.par	(revision 4952)
+++ /issm/trunk/test/Par/79North.par	(revision 4953)
@@ -1,45 +1,44 @@
 %Start defining model parameters here
 
-%Create geometry
-load('79Northdata.mat');
-md.surface=surface;
-md.bed=bed;
-md.thickness=thickness;
-md.vx=vx;
-md.vy=vy;
+%Geometry and observation
+load('./../Data/79North.data','-mat');
+md.vx       =InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y,0);
+md.vy       =InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y,0);
+md.surface  =InterpFromMeshToMesh2d(index,x,y,surface,md.x,md.y,0);
+md.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.x,md.y,0);
+md.bed=md.surface-md.thickness;
+clear surface thickness vx vy x y index;
 
-%Put melting on ice shelves
+%Materials
+md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
+
+%Friction
+pos=find(md.elementoniceshelf);
+md.drag_type=2;
+md.drag_coefficient=50*ones(md.numberofgrids,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
+
+%Ice shelf melting
 md.melting_rate=zeros(md.numberofgrids,1);
 pos=find(md.gridoniceshelf);
 md.melting_rate(pos)=10;
 
-%Create drag
-md.drag_type=2;
-md.drag_coefficient=50*ones(md.numberofgrids,1);
-%Take care of iceshelves: no basal drag
-pos=find(md.elementoniceshelf);
-md.drag_coefficient(md.elements(pos,:))=0;
-md.drag_p=ones(md.numberofelements,1);
-md.drag_q=ones(md.numberofelements,1);
+%Numerical parameters
 md.viscosity_overshoot=0.3;
+md.artificial_diffusivity=1;
+md.verbose=0;
+md.waitonlock=30;
+md.np=3;
+md.eps_res=0.05;
+md.eps_rel=0.005;
+md.eps_abs=NaN;
 
-%Create temperature and rheology
-md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
-md.rheology_B=paterson(md.observed_temperature);
-md.rheology_n=3*ones(md.numberofelements,1);
-
-%Deal with boundary conditions:
+%Boundary conditions:
 md=SetMarineIceSheetBC(md);
 pos=find(md.gridonboundary);
 md.spcthickness(pos,1)=1;
 md.spcthickness(pos,2)=md.thickness(pos);
-
-%Parallel options
-md.np=7;
-md.time=50;
-md.waitonlock=90;
-
-%Misc
-md.verbose=0;
-md.eps_abs=NaN;
-md.eps_rel=0.05;
Index: /issm/trunk/test/Par/Pig.par
===================================================================
--- /issm/trunk/test/Par/Pig.par	(revision 4952)
+++ /issm/trunk/test/Par/Pig.par	(revision 4953)
@@ -1,36 +1,36 @@
 %Start defining model parameters here
 
-load('Pigdata.mat');
-md.surface=surface;
-md.bed=bed;
-md.thickness=thickness;
-md.vx_obs=vx_obs;
-md.vy_obs=vy_obs;
+%Geometry and observation
+load('./../Data/Pig.data','-mat');
+md.vx_obs   =InterpFromMeshToMesh2d(index,x,y,vx_obs,md.x,md.y,0);
+md.vy_obs   =InterpFromMeshToMesh2d(index,x,y,vy_obs,md.x,md.y,0);
+md.surface  =InterpFromMeshToMesh2d(index,x,y,surface,md.x,md.y,0);
+md.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.x,md.y,0);
+md.bed=md.surface-md.thickness;
+clear surface thickness vx_obs vy_obs x y index;
 
-%Create drag
-md.drag_type=2;
-md.drag_coefficient=50*ones(md.numberofgrids,1);
-%Take care of iceshelves: no basal drag
-pos=find(md.elementoniceshelf);
-md.drag_coefficient(md.elements(pos,:))=0;
-md.drag_p=ones(md.numberofelements,1);
-md.drag_q=ones(md.numberofelements,1);
-md.viscosity_overshoot=0.3;
-
-%Create temperature and rheology
+%Materials
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 md.rheology_B=paterson(md.observed_temperature);
 md.rheology_n=3*ones(md.numberofelements,1);
 
-%Deal with boundary conditions:
+%Friction
+pos=find(md.elementoniceshelf);
+md.drag_type=2;
+md.drag_coefficient=50*ones(md.numberofgrids,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
+
+%Numerical parameters
+md.viscosity_overshoot=0.3;
+md.artificial_diffusivity=1;
+md.verbose=0;
+md.waitonlock=30;
+md.np=3;
+md.eps_res=0.05;
+md.eps_rel=0.005;
+md.eps_abs=NaN;
+
+%Boundary conditions:
 md=SetMarineIceSheetBC(md);
-
-%Parallel options
-md.np=3;
-md.time=50;
-md.waitonlock=60;
-
-%Misc
-md.verbose=0;
-md.eps_abs=NaN;
-md.eps_rel=0.005;
Index: /issm/trunk/test/Par/SquareSheetConstrained.par
===================================================================
--- /issm/trunk/test/Par/SquareSheetConstrained.par	(revision 4952)
+++ /issm/trunk/test/Par/SquareSheetConstrained.par	(revision 4953)
@@ -1,8 +1,5 @@
 %Start defining model parameters here
 
-%dynamics
-md.verbose=0;
-md.artificial_diffusivity=1;
-
+%Geometry
 hmin=300;
 hmax=1000;
@@ -13,24 +10,33 @@
 md.surface=md.bed+md.thickness;
 
-%Create drag
-md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
-%Take care of iceshelves: no basal drag
-pos=find(md.elementoniceshelf);
-md.drag_coefficient(md.elements(pos,:))=0;
-md.drag_p=ones(md.numberofelements,1);
-md.drag_q=ones(md.numberofelements,1);
-md.viscosity_overshoot=0.3;
+%Initial velocity 
+load('./../Data/SquareShelf.data','-mat');
+md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y,0);
+md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y,0);
+clear vx vy x y index;
 
-%Create temperature and rheology
+%Materials
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 md.rheology_B=paterson(md.observed_temperature);
 md.rheology_n=3*ones(md.numberofelements,1);
 
-%Deal with boundary conditions:
+%Friction
+pos=find(md.elementoniceshelf);
+md.drag_type=2;
+md.drag_coefficient=20*ones(md.numberofgrids,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
+
+%Numerical parameters
+md.viscosity_overshoot=0.3;
+md.artificial_diffusivity=1;
+md.verbose=0;
+md.waitonlock=30;
+md.np=3;
+md.eps_res=0.05;
+md.eps_rel=0.005;
+md.eps_abs=NaN;
+
+%Boundary conditions:
 md=SetIceSheetBC(md);
-
-%Parallel options
-md.np=3;
-md.time=50;
-md.waitonlock=30;
Index: /issm/trunk/test/Par/SquareShelf.par
===================================================================
--- /issm/trunk/test/Par/SquareShelf.par	(revision 4952)
+++ /issm/trunk/test/Par/SquareShelf.par	(revision 4953)
@@ -23,4 +23,5 @@
 %Friction
 pos=find(md.elementoniceshelf);
+md.drag_type=2;
 md.drag_coefficient=20*ones(md.numberofgrids,1);
 md.drag_coefficient(md.elements(pos,:))=0;
@@ -30,11 +31,11 @@
 %Numerical parameters
 md.viscosity_overshoot=0.3;
+md.artificial_diffusivity=1;
+md.waitonlock=30;
 md.verbose=0;
-md.artificial_diffusivity=1;
 md.np=3;
-md.waitonlock=30;
+md.eps_res=0.10;
+md.eps_rel=0.02;
 md.eps_abs=NaN;
-md.eps_rel=0.02;
-md.eps_res=1.10;
 
 %Boundary conditions:
Index: /issm/trunk/test/Par/SquareShelfConstrained.par
===================================================================
--- /issm/trunk/test/Par/SquareShelfConstrained.par	(revision 4952)
+++ /issm/trunk/test/Par/SquareShelfConstrained.par	(revision 4953)
@@ -1,8 +1,5 @@
 %Start defining model parameters here
 
-%dynamics
-md.verbose=0;
-md.artificial_diffusivity=1;
-
+%Geometry
 hmin=300;
 hmax=1000;
@@ -13,23 +10,33 @@
 md.surface=md.bed+md.thickness;
 
-md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
-%Take care of iceshelves: no basal drag
-pos=find(md.elementoniceshelf);
-md.drag_coefficient(md.elements(pos,:))=0;
-md.drag_p=ones(md.numberofelements,1);
-md.drag_q=ones(md.numberofelements,1);
-md.viscosity_overshoot=0.3;
+%Initial velocity 
+load('./../Data/SquareShelfConstrained.data','-mat');
+md.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.x,md.y,0);
+md.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.x,md.y,0);
+clear vx vy x y index;
 
-%Create temperature and rheology
+%Materials
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 md.rheology_B=paterson(md.observed_temperature);
 md.rheology_n=3*ones(md.numberofelements,1);
 
+%Friction
+pos=find(md.elementoniceshelf);
+md.drag_type=2;
+md.drag_coefficient=20*ones(md.numberofgrids,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
+
+%Numerical parameters
+md.viscosity_overshoot=0.3;
+md.artificial_diffusivity=1;
+md.verbose=0;
+md.waitonlock=30;
+md.np=3;
+md.eps_res=0.05;
+md.eps_rel=0.005;
+md.eps_abs=NaN;
+
 %Deal with boundary conditions:
-md=SetIceSheetBC(md);
-
-%Parallel options
-md.np=3;
-md.time=50;
-md.waitonlock=30;
+md=SetIceShelfBC(md);