Changeset 4883 for issm/trunk/test/Validation/ISMIP/TestA/runme.m

Timestamp:

07/29/10 12:42:22 (15 years ago)

Author:

seroussi

Message:

Validation tests ISMIP-HOM

File:

• issm/trunk/test/Validation/ISMIP/TestA/runme.m (modified) (1 diff)

issm/trunk/test/Validation/ISMIP/TestA/runme.m

@@ -12 +12 @@
 md=extrude(md,10,1);
 
-%Create dirichlet on the bed on top of the borders
-pos=find(md.gridonbed);
-md.gridondirichlet_diag(pos)=1;
-
 md=setelementstype(md,'pattyn','all');
 %md=setelementstype(md,'pattyn','all','stokes','all'); 
 
 %Create dirichlet on the bed only
-md.gridondirichlet_diag=zeros(md.numberofgrids,1);
+md.spcvelocity=zeros(md.numberofgrids,6);
 pos=find(md.gridonbed);
-md.gridondirichlet_diag(pos)=1;
+md.spcvelocity(pos,1:2)=1;
 
 %Create MPCs to have periodic boundary conditions
-posx=find(md.x==0);
-posx2=find(md.x==max(md.x));
-
-posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
-posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
-
-md.penalties=[posx,posx2;posy,posy2];
+%posx=find(md.x==0);
+%posx2=find(md.x==max(md.x));
+%
+%posy=find(md.y==0 & md.x~=0 & md.x~=max(md.x)); %Don't take the same grids two times
+%posy2=find(md.y==max(md.y) & md.x~=0 & md.x~=max(md.x));
+%
+%md.penalties=[posx,posx2;posy,posy2];
 
 %Compute the diagnostic
-md=solve(md,'analysis_type','diagnostic','package','ice');
+md=solve(md,'analysis_type',DiagnosticSolutionEnum);
+vx=zeros(md.numberofgrids,1);
+vx(md.results.DiagnosticSolution.Vx.index)=md.results.DiagnosticSolution.Vx.value;
+vy=zeros(md.numberofgrids,1);
+vy(md.results.DiagnosticSolution.Vy.index)=md.results.DiagnosticSolution.Vy.value;
+vz=zeros(md.numberofgrids,1);
+vz(md.results.DiagnosticSolution.Vz.index)=md.results.DiagnosticSolution.Vz.value;
 
-plotmodel(md,'data',md.results.diagnostic.vx,'data',md.results.diagnostic.vy,'data',md.results.diagnostic.vz,'layer#all',md.numlayers,'contourlevels',{9.2,18.4,27.6,46,73.6,82.8},'contourlevels',{0,-1.2,-0.9,-0.6,-0.3,1.2},'contourlevels',{-5.2,-3.9,-1.3,0,1.3,3.9,5.2})
+plotmodel(md,'data',vx,'data',vy,'data',vz,'layer#all',md.numlayers,'contourlevels',{9.2,18.4,27.6,46,73.6,82.8},'contourlevels',{0,-1.2,-0.9,-0.6,-0.3,1.2},'contourlevels',{-5.2,-3.9,-1.3,0,1.3,3.9,5.2})