Index: /issm/trunk/test/Validation/EISMINT/MassConservation/CrossLine2.exp
===================================================================
--- /issm/trunk/test/Validation/EISMINT/MassConservation/CrossLine2.exp	(revision 3573)
+++ /issm/trunk/test/Validation/EISMINT/MassConservation/CrossLine2.exp	(revision 3573)
@@ -0,0 +1,7 @@
+## Name:domainoutline
+## Icon:0
+# Points Count  Value
+2 1.
+# X pos Y pos
+10000  199999
+110000 0
Index: /issm/trunk/test/Validation/EISMINT/MassConservation/runme.m
===================================================================
--- /issm/trunk/test/Validation/EISMINT/MassConservation/runme.m	(revision 3572)
+++ /issm/trunk/test/Validation/EISMINT/MassConservation/runme.m	(revision 3573)
@@ -2,10 +2,7 @@
 % Vincent Rommelaere 1996
 
-cluster='none';
-np=2;
-
 %The goal is to test the prognostic model
-md=model;
-md=mesh(md,'DomainOutline.exp',4550);
+%md=bamg(model,'domain','DomainOutline.exp','hmax',4550);
+md=bamg(model,'domain','DomainOutline.exp','hmax',3000);
 md=geography(md,'all','');
 md=parameterize(md,'Square.par');
@@ -13,15 +10,34 @@
 
 %Evolution of the ice shelf
-md.ndt=500*md.yts;
-md.dt=5*md.yts;
-md.artificial_diffusivity=1; %Better result with no artificial diffusivity
+md.ndt=500;
+md.dt=1;
+md.artificial_diffusivity=0; %Better result with no artificial diffusivity
 
-%launch transient solution
-md.cluster=cluster;
-md.np=np;
-md=solve(md,'analysis_type','transient');
+%0launch transient solution
+%md=solve(md,'analysis_type','transient');
+%FOR NOW:
+md.cluster=oshostname();
+md.np=8;
+i=0;
+time=0;
+md.dummy=struct();
+pos=find(md.y>199999.9);
+connectivity=full(sparse(md.elements(:),1,1));
+while(time<500),
+	disp(['step ' num2str(i) '/' num2str(500/md.dt)]);
+	i=i+1;
+	time=time+md.dt;
+	md=solve(md,'analysis_type','prognostic2','package','ice');
+	%thickness=full(sparse(reshape(md.elements',3*md.numberofelements,1),1,md.results.prognostic2.thickness));
+	%md.thickness=thickness./connectivity;
+	md.thickness=md.results.prognostic2.thickness;
+	md.thickness(pos)=500+100*sin(2*pi*time/200)*ones(size(pos,1),1);
+	md.surface=md.bed+md.thickness;
+	md.dummy(i).thickness=md.thickness;
+	%plotmodel(md,'data',md.thickness,'sectionvalue','CrossLine.exp')
+end
 
 %plot results
-plotmodel(md,'data',md.results.transient(end).thickness,'sectionvalue','CrossLine.exp')
+plotmodel(md,'data',[md.thickness 500+100*sin(2*pi/200*(500-md.y/400))],'sectionvalue','CrossLine.exp')
 
 %Don't forget to add these lines in icetransient2d.m, just before the computation of the thickness to change the thickness on the upper boundary condition
Index: /issm/trunk/test/Validation/EISMINT/MassConservation/runme2.m
===================================================================
--- /issm/trunk/test/Validation/EISMINT/MassConservation/runme2.m	(revision 3573)
+++ /issm/trunk/test/Validation/EISMINT/MassConservation/runme2.m	(revision 3573)
@@ -0,0 +1,51 @@
+%This test is a test from the EISMINT for Ice shelves 
+% Vincent Rommelaere 1996
+
+%The goal is to test the prognostic model
+%md=bamg(model,'domain','DomainOutline.exp','hmax',4550);
+md=bamg(model,'domain','DomainOutline.exp','hmax',3000);
+md=geography(md,'all','');
+md=parameterize(md,'Square.par');
+md=setelementstype(md,'macayeal','all');
+
+%Evolution of the ice shelf
+md.ndt=500;
+md.dt=1;
+md.artificial_diffusivity=0; %Better result with no artificial diffusivity
+md.vx=160*sqrt(5)*ones(md.numberofgrids,1);
+md.vy= 80*sqrt(5)*ones(md.numberofgrids,1);
+
+%0launch transient solution
+%md=solve(md,'analysis_type','transient');
+%FOR NOW:
+md.cluster=oshostname();
+md.np=10;
+i=0;
+time=0;
+md.dummy=struct();
+posDOWN=find(md.y<0.01);
+posLEFT=find(md.x<0.01);
+connectivity=full(sparse(md.elements(:),1,1));
+while(time<100),
+	disp(['step ' num2str(i) '/' num2str(500/md.dt)]);
+	i=i+1;
+	time=time+md.dt;
+	md=solve(md,'analysis_type','prognostic2','package','ice');
+	%thickness=full(sparse(reshape(md.elements',3*md.numberofelements,1),1,md.results.prognostic2.thickness));
+	%md.thickness=thickness./connectivity;
+	md.thickness=md.results.prognostic2.thickness;
+	md.thickness(posLEFT)=500+100*sin((2*pi/200)*(time-md.y(posLEFT)/md.vy(1)));
+	md.thickness(posDOWN)=500+100*sin((2*pi/200)*(time-md.x(posDOWN)/md.vx(1)));
+	md.surface=md.bed+md.thickness;
+	md.dummy(i).thickness=md.thickness;
+	%plotmodel(md,'data',md.thickness,'sectionvalue','CrossLine.exp')
+end
+
+%plot results
+plotmodel(md,'data',[md.thickness 500+100*sin(2*pi/200*(500-md.y/400))],'sectionvalue','CrossLine2.exp')
+
+%Don't forget to add these lines in icetransient2d.m, just before the computation of the thickness to change the thickness on the upper boundary condition
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%pos=find(m_p.ys~=0);
+%m_p.ys(pos)=500+500/5*sin(2*pi*time/(200*md.yts))*ones(size(pos,1),1);
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%