Changeset 2527

Timestamp:

10/23/09 15:29:39 (16 years ago)

Author:

seroussi

Message:

Updated ISMIP-HOM testF for actual ISSM

Location:

issm/trunk/test/Validation/ISMIP/TestF

Files:

• Square.par (modified) (2 diffs)
• runme.m (modified) (1 diff)

issm/trunk/test/Validation/ISMIP/TestF/Square.par

@@ -1 +1 @@
 %Ok, start defining model parameters here
-md.debug=1;
+md.verbose=2;
 
 disp('      creating thickness');
@@ -22 +22 @@
 %Create grid on boundary fist (because we cannot use mesh)
 md=SetIceSheetBC(md);
-md.dirichletvalues_diag=ones(md.numberofgrids,1)*[200 0];
-%md.dirichletvalues_diag=ones(md.numberofgrids,1)*[100 0];
-%md.dirichletvalues_diag=zeros(md.numberofgrids,2);
+md.spcvelocity(:,4)=100*ones(md.numberofgrids,1);
 md.vx=zeros(md.numberofgrids,1);
 md.vy=zeros(md.numberofgrids,1);
 md.vz=zeros(md.numberofgrids,1);
+md.vel=zeros(md.numberofgrids,1);
 md.pressure=zeros(md.numberofgrids,1);
 md.temperature=255*ones(md.numberofgrids,1);
-md.gridondirichlet_prog=zeros(md.numberofgrids,1);
 pos=find(md.x==min(md.x) | md.x==max(md.x));
-md.gridondirichlet_prog(pos)=1;
-md.dirichletvalues_prog=md.thickness;
-md.gridondirichlet_thermal=zeros(md.numberofgrids,1);
+md.spcthickness(pos,1)=1;
+md.spcthickness(pos,2)=md.thickness(pos);
+md.spctemperature=[ones(md.numberofgrids,1) 255*ones(md.numberofgrids,1)];
 
 %Parallel options
-md.connectivity=100;
+md.connectivity=200;
 md.np=8;
-md.cluster='wilkes';
+md.cluster='astrid';
 md.time=50;
-md.waitonlock=1;
 
 %Transient options
-md.dt=2.*md.yts;
-md.ndt=10*md.dt;
+md.dt=1;
+md.ndt=10;
 md.artificial_diffusivity=1;

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

@@ -18 +18 @@
 %Create dirichlet on the bed if no slip
 pos=find(md.gridonbed);
-md.gridondirichlet_diag(pos)=1;
-md.dirichletvalues_diag(pos,:)=0;
+md.spcvelocity(pos,1:2)=1;
+md.spcvelocity(pos,4:5)=0;
 
 %%Create MPCs to have periodic boundary conditions