Changeset 3156

Timestamp:

03/02/10 13:13:32 (15 years ago)

Author:

seroussi

Message:

updated test with actual fields

Location:

issm/trunk/test/Validation/EISMINT/MassConservation

Files:

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

issm/trunk/test/Validation/EISMINT/MassConservation/Square.par

@@ -6 +6 @@
 md.thickness=500*ones(md.numberofgrids,1);
 md.firn_layer=0*ones(md.numberofgrids,1);
-md.bed=-di*md.thickness;
+md.bed=-md.rho_ice/md.rho_water*md.thickness;
 md.surface=md.bed+md.thickness;
 
@@ -33 +33 @@
 md=SetMarineIceSheetBC(md,'Front.exp');
 
+disp('      initial velocity');
+md.vx=zeros(md.numberofgrids,1);
+md.vy=-400*ones(md.numberofgrids,1);
+md.vz=zeros(md.numberofgrids,1);
+
 %analytical test
-pos=find(md.y==200000); %grids on the upper boundary condition
-md.gridondirichlet_diag=ones(md.numberofgrids,1);
-md.dirichletvalues_diag(:,1)=0;
-md.dirichletvalues_diag(:,2)=-400;
+md.spcvelocity(:,1:3)=1;
+md.spcvelocity(:,4)=0;
+md.spcvelocity(:,5)=-400;
+md.spcvelocity(1,1)=0;
 
 %analytical test
 pos=find(md.y==200000); %grids on the upper boundary condition
-md.gridondirichlet_prog(pos)=1;
-md.dirichletvalues_prog(pos)=500;
+md.spcthickness(pos,1)=1;
+md.spcthickness(pos,2)=500;

issm/trunk/test/Validation/EISMINT/MassConservation/runme.m

@@ -1 +1 @@
 %This test is a test from the EISMINT for Ice shelves 
 % Vincent Rommelaere 1996
+
+cluster='none';
+np=2;
 
 %The goal is to test the prognostic model
@@ -12 +15 @@
 md.ndt=500*md.yts;
 md.dt=5*md.yts;
-md.artificial_diffusivity=0; %Better result with no artificial diffusivity
+md.artificial_diffusivity=1; %Better result with no artificial diffusivity
 
 %launch transient solution
-md=solve(md,'analysis_type','transient','package','ice');
+md.cluster=cluster;
+md.np=np;
+md=solve(md,'analysis_type','transient');
 
 %plot results